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

Bugfix: yet another race in read_repair, sweet

Browse source
This commit is contained in:
Scott Lystig Fritchie 2014-02-20 22:05:05 +09:00
parent 370c57b78a
commit e40394a3a7
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
prototype/corfurl/src/corfurl.erl
View file

@ -98,7 +98,7 @@ write_single_page_to_chain([FLU|Rest], Epoch, LPN, Page, Nth) ->
%% TODO: same TODO as the above error_badepoch case. %% TODO: same TODO as the above error_badepoch case.
error_badepoch; error_badepoch;
Else -> Else ->
error({left_off_here, ?MODULE, ?LINE, Else}) giant_error({left_off_here, ?MODULE, ?LINE, Else})
end end
end. end.
@ -122,6 +122,13 @@ read_page(#proj{epoch=Epoch} = P, LPN) ->
%% Let it crash: error_overwritten %% Let it crash: error_overwritten
end. end.
ok_or_trim(ok) ->
ok;
ok_or_trim(error_trimmed) ->
ok;
ok_or_trim(Else) ->
Else.
read_repair_chain(Epoch, LPN, [Head|Rest] = Chain) -> read_repair_chain(Epoch, LPN, [Head|Rest] = Chain) ->
case corfurl_flu:read(flu_pid(Head), Epoch, LPN) of case corfurl_flu:read(flu_pid(Head), Epoch, LPN) of
{ok, Page} -> {ok, Page} ->
@ -130,10 +137,11 @@ read_repair_chain(Epoch, LPN, [Head|Rest] = Chain) ->
error_badepoch; error_badepoch;
error_trimmed -> error_trimmed ->
%% TODO: robustify %% TODO: robustify
[ok = case corfurl_flu:trim(flu_pid(X), Epoch, LPN) of [ok = case ok_or_trim(corfurl_flu:trim(flu_pid(X), Epoch, LPN)) of
ok -> ok; ok -> ok;
error_trimmed -> ok; error_unwritten -> ok_or_trim(corfurl_flu:fill(
Else -> Else flu_pid(X), Epoch, LPN));
Else -> Else
end || X <- Rest], end || X <- Rest],
error_trimmed; error_trimmed;
error_unwritten -> error_unwritten ->
@ -160,8 +168,8 @@ read_repair_chain2([RepairFLU|Rest], Epoch, LPN, Page, OriginalChain) ->
%% to fix problems? %% to fix problems?
{ok, Page2}; {ok, Page2};
{ok, _Page2} -> {ok, _Page2} ->
error({bummerbummer, ?MODULE, ?LINE, sanity_check_failure, giant_error({bummerbummer, ?MODULE, ?LINE,
lpn, LPN, epoch, Epoch}); sanity_check_failure, lpn, LPN, epoch, Epoch});
error_badepoch -> error_badepoch ->
error_badepoch; error_badepoch;
error_trimmed -> error_trimmed ->
@ -241,6 +249,10 @@ flu_pid(X) when is_pid(X) ->
flu_pid(X) when is_atom(X) -> flu_pid(X) when is_atom(X) ->
ets:lookup_element(flu_pid_tab, X, 1). ets:lookup_element(flu_pid_tab, X, 1).
giant_error(Err) ->
io:format(user, "GIANT ERROR: ~p\n", [Err]),
exit(Err).
%%%% %%%% %%%% projection utilities %%%% %%%% %%%% %%%% %%%% %%%% projection utilities %%%% %%%% %%%%
new_range(Start, End, ChainList) -> new_range(Start, End, ChainList) ->