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

Fix dumb think-o in corfurl_client:append_page() retry counter

Browse source
This commit is contained in:
Scott Lystig Fritchie 2014-02-27 12:36:02 +09:00
parent 04f2105df0
commit 1f0e43d33f
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
prototype/corfurl/src/corfurl_client.erl
View file

@ -20,7 +20,8 @@
-module(corfurl_client). -module(corfurl_client).
-export([append_page/2, read_page/2]). -export([append_page/2]).
%% -export([append_page/2, read_page/2]).
-export([restart_sequencer/1]). -export([restart_sequencer/1]).
-include("corfurl.hrl"). -include("corfurl.hrl").
@ -29,10 +30,11 @@
%% -define(LONG_TIME, 30*1000). %% -define(LONG_TIME, 30*1000).
append_page(Proj, Page) -> append_page(Proj, Page) ->
append_page(Proj, Page, 1). append_page(Proj, Page, 50).
append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries) append_page(Proj, _Page, 0) ->
when Retries < 50 -> {error_failed, Proj};
append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries) ->
try try
case corfurl_sequencer:get(Sequencer, 1) of case corfurl_sequencer:get(Sequencer, 1) of
{ok, LPN} -> {ok, LPN} ->
@ -40,25 +42,23 @@ append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries)
lost_race -> lost_race ->
append_page(Proj, Page, Retries - 1); append_page(Proj, Page, Retries - 1);
error_badepoch -> error_badepoch ->
case poll_for_new_epoch_projection(P) of case poll_for_new_epoch_projection(Proj) of
{ok, NewP} -> {ok, NewProj} ->
append_page(NewProj, Page, Retries-1); append_page(NewProj, Page, Retries - 1);
Else -> Else ->
{Else, P} {Else, Proj}
end; end;
Else -> Else ->
{Else, P} {Else, Proj}
end end
end end
catch catch
exit:{Reason,{_gen_server_or_pulse_gen_server,call,[Sequencer|_]}} exit:{Reason,{_gen_server_or_pulse_gen_server,call,[Sequencer|_]}}
when Reason == noproc; Reason == normal -> when Reason == noproc; Reason == normal ->
append_page(restart_sequencer(P), Page, Retries); append_page(restart_sequencer(Proj), Page, Retries);
exit:Exit -> exit:Exit ->
{failed, incomplete_code, Exit} {failed, incomplete_code, Exit}
end; end.
append_page(Proj, _Page, _Retries) ->
{error_badepoch, Proj}.
append_page2(Proj, LPN, Page) -> append_page2(Proj, LPN, Page) ->
case corfurl:write_page(Proj, LPN, Page) of case corfurl:write_page(Proj, LPN, Page) of
@ -74,8 +74,18 @@ append_page2(Proj, LPN, Page) ->
%% Let it crash: error_unwritten %% Let it crash: error_unwritten
end. end.
%% read_page(Proj, Page) ->
%% read_page(Proj, Page, 10).
%% read_page(Proj, LPN) -> %% read_page(Proj, LPN) ->
%% case corfurl:read_page(Proj, %% case corfurl:read_page(Proj, LPN) of
%% error_badepoch ->
%% case poll_for_new_epoch_projection(P) of
%% {ok, NewP} ->
%% read_page(NewProj, Page);
%% Else ->
%% {Else, P}
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%