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

Bugfix: CP mode: ignore P_latest if it has UPI or down server in my down list

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-09-15 17:55:18 +09:00
parent 5001406499
commit d3b116bd9e
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/machi_chain_manager1.erl
View file

@ -1321,9 +1321,29 @@ react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP,
P_latest#projection_v1.author_server /= MyName, P_latest#projection_v1.author_server /= MyName,
P_latestStable = make_basic_comparison_stable(P_latest), P_latestStable = make_basic_comparison_stable(P_latest),
P_currentStable = make_basic_comparison_stable(P_current), P_currentStable = make_basic_comparison_stable(P_current),
%% 2015-09-15: Experiment time. For CP mode, if the P_latest UPI includes
%% me, then this clause is possible. However, if P_latest has a server in
%% UPI or repairing that I believe is down, then this projection is not
%% relevant to me. E.g. in CP mode, if P_newprop is none proj (not
%% because AmHosedP is true but because I've decided that a majority
%% quorum is not possible now), then P_newprop will have a very low rank!
Latest_vs_newprop_down_p =
if CMode == ap_mode ->
%% TODO: Apply 2015-09-15 comment above to AP mode also?
false;
CMode == cp_mode ->
P_latest_s = ordsets:from_list(P_latest#projection_v1.upi ++
P_latest#projection_v1.repairing),
Down_s = ordsets:from_list(P_newprop#projection_v1.down),
%% If any of P_latest's servers are in P_newprop's down, then
%% we have a disagreement.
not ordsets:is_disjoint(P_latest_s, Down_s)
end,
?REACT({a40, ?LINE, ?REACT({a40, ?LINE,
[{latest_author, P_latest#projection_v1.author_server}, [{latest_author, P_latest#projection_v1.author_server},
{author_is_down_p, LatestAuthorDownP}]}), {author_is_down_p, LatestAuthorDownP},
{rank_latest, Rank_latest},
{rank_newprop, Rank_newprop}]}),
if if
AmHosedP -> AmHosedP ->
@ -1466,6 +1486,12 @@ react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP,
react_to_env_C300(P_newprop, P_latest, S); react_to_env_C300(P_newprop, P_latest, S);
Latest_vs_newprop_down_p ->
?REACT({a40, ?LINE, []}),
%% P_latest isn't relevant: it has at least one member of UPI
%% and/or repairing that we believe is down. Write P_newprop.
react_to_env_C300(P_newprop, P_latest, S);
true -> true ->
?REACT({a40, ?LINE, [true]}), ?REACT({a40, ?LINE, [true]}),
CurrentZerfInStatus_p = has_make_zerf_annotation(P_current), CurrentZerfInStatus_p = has_make_zerf_annotation(P_current),