greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix machi_file_proxy_eqc:write_post to proper assertion

Browse source
This commit is contained in:
UENISHI Kota 2015-11-05 14:48:35 +09:00
parent f56037240e
commit ce41f9005e
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
test/machi_file_proxy_eqc.erl
View file

@ -88,12 +88,14 @@ data_with_csum(Limit) ->
intervals([]) -> intervals([]) ->
[]; [];
intervals([N]) -> intervals([N]) ->
[{N, choose(1,150)}]; [{N, choose(1,1)}];
intervals([A,B|T]) -> intervals([A,B|T]) ->
[{A, choose(1, B-A)}|intervals([B|T])]. [{A, oneof([choose(1, B-A), B-A])}|intervals([B|T])].
interval_list() -> interval_list() ->
?LET(L, list(choose(1024, 4096)), intervals(lists:usort(L))). ?LET(L,
oneof([list(choose(1025, 1033)), list(choose(1024, 4096))]),
intervals(lists:usort(L))).
shuffle_interval() -> shuffle_interval() ->
?LET(L, interval_list(), shuffle(L)). ?LET(L, interval_list(), shuffle(L)).
@ -297,30 +299,18 @@ write_args(S) ->
{Off, Len} = hd(S#state.planned_writes), {Off, Len} = hd(S#state.planned_writes),
[S#state.pid, Off, data_with_csum(Len)]. [S#state.pid, Off, data_with_csum(Len)].
write_ok(S, [_Pid, Off, {Bin, _Tag, _Csum}]) -> write_post(S, [_Pid, Off, {Bin, _Tag, _Csum}] = _Args, Res) ->
Size = iolist_size(Bin), Size = iolist_size(Bin),
%% Check writes checks if a byte range is *written*
%% So writes are ok IFF they are NOT written, so
%% we want not check_writes/3 to be true.
case {get_overlaps(Off, Size, S#state.written, []), case {get_overlaps(Off, Size, S#state.written, []),
get_overlaps(Off, Size, S#state.trimmed, [])} of get_overlaps(Off, Size, S#state.trimmed, [])} of
{[], []} -> {[], []} ->
true; %% No overlap neither with written ranges nor trimmed
{[{Off, Size}], []} -> %% ranges; OK to write things.
true; eq(Res, ok);
_Other -> {_, _} ->
false %% overlap found in either or both at written or at
end. %% trimmed ranges; can't write.
is_error(Res)
write_post(S, Args, Res) ->
case write_ok(S, Args) of
%% false means this range has NOT been written before, so
%% it should succeed
true -> eq(Res, ok);
%% If we get true, then we've already written or trimmed this
%% section or a portion of this range to disk and should
%% return an error.
false -> is_error(Res)
end. end.
write_next(S, Res, [_Pid, Offset, {Bin, _Tag, _Csum}]) -> write_next(S, Res, [_Pid, Offset, {Bin, _Tag, _Csum}]) ->