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

Add ExpectedUPI to A40's AmHosedP clause

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-09-10 00:43:37 +09:00
parent 10c655ebfe
commit 5943494d54
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/machi_chain_manager1.erl
View file

@ -1274,7 +1274,8 @@ a40_latest_author_down(#projection_v1{author_server=LatestAuthor}=_P_latest,
lists:member(LatestAuthor, NewPropDown). lists:member(LatestAuthor, NewPropDown).
react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP, AmHosedP, react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP, AmHosedP,
#ch_mgr{name=MyName, proj=P_current}=S) -> #ch_mgr{name=MyName, proj=P_current,
consistency_mode=CMode}=S) ->
?REACT(a40), ?REACT(a40),
[{Rank_newprop, _}] = rank_projections([P_newprop], P_current), [{Rank_newprop, _}] = rank_projections([P_newprop], P_current),
[{Rank_latest, _}] = rank_projections([P_latest], P_current), [{Rank_latest, _}] = rank_projections([P_latest], P_current),
@ -1289,18 +1290,20 @@ react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP, AmHosedP,
if if
AmHosedP -> AmHosedP ->
if P_current#projection_v1.upi /= [] ExpectedUPI = if CMode == cp_mode -> [];
CMode == ap_mode -> [MyName]
end,
io:format(user, "A40: hosed ~w: current upi ~w newprop upi ~w auth ~w\n", [MyName, P_current#projection_v1.upi, P_newprop#projection_v1.upi, P_current#projection_v1.author_server]),
if P_current#projection_v1.upi /= ExpectedUPI
andalso andalso
P_newprop#projection_v1.upi == [] -> P_newprop#projection_v1.upi == ExpectedUPI ->
io:format(user, "TODO this clause needs more review!\n",[]),
%% This is a cp_mode case only.
%% I am hosed. I need to shut up and quit disturbing my %% I am hosed. I need to shut up and quit disturbing my
%% peers. If P_latest is the none projection that I wrote %% peers. If P_latest is the none projection that I wrote
%% on a previous iteration and it's also unanimous, then %% on a previous iteration and it's also unanimous, then
%% go to B10 so that I can adopt it. Otherwise, tell the %% go to B10 so that I can adopt it. Otherwise, tell the
%% world my intention via C300. %% world my intention via C300.
if P_latest#projection_v1.author_server == MyName andalso if P_latest#projection_v1.author_server == MyName andalso
P_latest#projection_v1.upi == [] andalso P_latest#projection_v1.upi == ExpectedUPI andalso
LatestUnanimousP -> LatestUnanimousP ->
?REACT({a40, ?LINE, []}), ?REACT({a40, ?LINE, []}),
react_to_env_B10(Retries, P_newprop, P_latest, react_to_env_B10(Retries, P_newprop, P_latest,
@ -1464,9 +1467,10 @@ react_to_env_A50(P_latest, FinalProps, #ch_mgr{proj=P_current}=S) ->
{{no_change, FinalProps, P_current#projection_v1.epoch_number}, S}. {{no_change, FinalProps, P_current#projection_v1.epoch_number}, S}.
react_to_env_B10(Retries, P_newprop, P_latest, LatestUnanimousP, react_to_env_B10(Retries, P_newprop, P_latest, LatestUnanimousP,
AmHosedP, Rank_newprop, Rank_latest, #ch_mgr{name=MyName}=S) -> _AmHosedP, Rank_newprop, Rank_latest, #ch_mgr{name=MyName}=S) ->
?REACT(b10), ?REACT(b10),
if _AmHosedP -> io:format(user, "B10: ~w: AmHosedP\n", [MyName]); true -> ok end,
?REACT({b10,?LINE,[{newprop_epoch,P_newprop#projection_v1.epoch_number}]}), ?REACT({b10,?LINE,[{newprop_epoch,P_newprop#projection_v1.epoch_number}]}),
if if
LatestUnanimousP -> LatestUnanimousP ->