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

Add retry loop for read_page/2, fill_page/2, trim_page/2

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

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

@ -20,8 +20,7 @@
-module(corfurl_client). -module(corfurl_client).
-export([append_page/2]). -export([append_page/2, read_page/2, fill_page/2, trim_page/2]).
%% -export([append_page/2, read_page/2]).
-export([restart_sequencer/1]). -export([restart_sequencer/1]).
-include("corfurl.hrl"). -include("corfurl.hrl").
@ -30,10 +29,10 @@
%% -define(LONG_TIME, 30*1000). %% -define(LONG_TIME, 30*1000).
append_page(Proj, Page) -> append_page(Proj, Page) ->
append_page(Proj, Page, 50). append_page(Proj, Page, 5).
append_page(Proj, _Page, 0) -> append_page(Proj, _Page, 0) ->
{error_failed, Proj}; {{error_failed, ?MODULE, ?LINE}, Proj};
append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries) -> append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries) ->
try try
case corfurl_sequencer:get(Sequencer, 1) of case corfurl_sequencer:get(Sequencer, 1) of
@ -57,7 +56,7 @@ append_page(#proj{seq={Sequencer,_,_}} = Proj, Page, Retries) ->
when Reason == noproc; Reason == normal -> when Reason == noproc; Reason == normal ->
append_page(restart_sequencer(Proj), Page, Retries); append_page(restart_sequencer(Proj), Page, Retries);
exit:Exit -> exit:Exit ->
{failed, incomplete_code, Exit} {{error_failed, ?MODULE, ?LINE}, incomplete_code, Exit}
end. end.
append_page2(Proj, LPN, Page) -> append_page2(Proj, LPN, Page) ->
@ -74,22 +73,32 @@ append_page2(Proj, LPN, Page) ->
%% Let it crash: error_unwritten %% Let it crash: error_unwritten
end. end.
%% read_page(Proj, Page) -> read_page(Proj, LPN) ->
%% read_page(Proj, Page, 10). retry_loop(Proj, fun(P) -> corfurl:read_page(P, LPN) end, 10).
%% read_page(Proj, LPN) ->
%% 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}
trim_page(Proj, LPN) ->
retry_loop(Proj, fun(P) -> corfurl:trim_page(P, LPN) end, 10).
fill_page(Proj, LPN) ->
retry_loop(Proj, fun(P) -> corfurl:fill_page(P, LPN) end, 10).
%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
retry_loop(Proj, _Fun, 0) ->
{{error_failed, ?MODULE, ?LINE}, Proj};
retry_loop(Proj, Fun, Retries) ->
case Fun(Proj) of
error_badepoch ->
case poll_for_new_epoch_projection(Proj) of
{ok, NewProj} ->
retry_loop(NewProj, Fun, Retries - 1);
_Else ->
{{error_failed, ?MODULE, ?LINE}, Proj}
end;
Else ->
{Else, Proj}
end.
restart_sequencer(#proj{epoch=Epoch, dir=Dir} = P) -> restart_sequencer(#proj{epoch=Epoch, dir=Dir} = P) ->
case corfurl:latest_projection_epoch_number(Dir) of case corfurl:latest_projection_epoch_number(Dir) of
N when N > Epoch -> N when N > Epoch ->