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

Bugfix: more to ignore in make_basic_comparison_stable()

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-31 17:57:37 +09:00
parent bce225a200
commit 1e5d58b22d
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/machi_chain_manager1.erl
View file

@ -1163,13 +1163,28 @@ react_to_env_A29(Retries, P_latest, LatestUnanimousP, ReadExtra,
machi_projection:get_epoch_id(P_current), machi_projection:get_epoch_id(P_current),
#projection_v1{author_server=Author_latest} = P_latest, #projection_v1{author_server=Author_latest} = P_latest,
{Epoch_latest,_} = EpochID_latest = machi_projection:get_epoch_id(P_latest), {Epoch_latest,_} = EpochID_latest = machi_projection:get_epoch_id(P_latest),
true = (Epoch_latest >= Epoch_current orelse Epoch_latest == 0), % sanity check
Trigger = if CMode == cp_mode, EpochID_latest /= EpochID_current -> Trigger = if CMode == cp_mode, EpochID_latest /= EpochID_current ->
?REACT({a29, ?LINE,
[{epoch_id_latest,EpochID_latest},
{epoch_id_current,EpochID_current}]}),
true; true;
true -> true ->
?REACT({a29, ?LINE, []}),
false false
end, end,
if Trigger -> if Trigger ->
?REACT({a29, ?LINE,
[{old_current, machi_projection:make_summary(P_current)}]}),
if Epoch_latest >= Epoch_current orelse Epoch_latest == 0 orelse
P_current#projection_v1.upi == [] ->
ok; % sanity check
true ->
exit({?MODULE,?LINE,
{epoch_latest,Epoch_latest},
{epoch_current,Epoch_current},
{latest,machi_projection:make_summary(P_latest)},
{current,machi_projection:make_summary(P_current)}})
end,
put(yyy_hack, []), put(yyy_hack, []),
case make_zerf(P_current, S) of case make_zerf(P_current, S) of
Zerf when is_record(Zerf, projection_v1) -> Zerf when is_record(Zerf, projection_v1) ->
@ -1188,6 +1203,7 @@ react_to_env_A29(Retries, P_latest, LatestUnanimousP, ReadExtra,
{{{yo_todo_incomplete_fix_me_cp_mode, line, ?LINE, Zerf}}} {{{yo_todo_incomplete_fix_me_cp_mode, line, ?LINE, Zerf}}}
end; end;
true -> true ->
?REACT({a29, ?LINE, []}),
react_to_env_A30(Retries, P_latest, LatestUnanimousP, ReadExtra, S) react_to_env_A30(Retries, P_latest, LatestUnanimousP, ReadExtra, S)
end. end.
@ -1546,8 +1562,8 @@ react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP,
LatestAuthorDownP = a40_latest_author_down(P_latest, P_newprop, S) LatestAuthorDownP = a40_latest_author_down(P_latest, P_newprop, S)
andalso andalso
P_latest#projection_v1.author_server /= MyName, P_latest#projection_v1.author_server /= MyName,
P_latestStable = make_comparison_stable(P_latest), P_latestStable = make_basic_comparison_stable(P_latest),
P_currentStable = make_comparison_stable(P_current), P_currentStable = make_basic_comparison_stable(P_current),
?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},
@ -3570,8 +3586,12 @@ make_annotation(EpochID, Time) ->
is_annotated(#projection_v1{dbg2=Dbg2}) -> is_annotated(#projection_v1{dbg2=Dbg2}) ->
proplists:get_value(private_proj_is_upi_unanimous, Dbg2, false). proplists:get_value(private_proj_is_upi_unanimous, Dbg2, false).
make_comparison_stable(P) -> make_basic_comparison_stable(P) ->
P#projection_v1{creation_time=undefined, flap=undefined, dbg2=[]}. P#projection_v1{creation_time=undefined,
flap=undefined,
dbg=[],
dbg2=[],
members_dict=[]}.
has_make_zerf_annotation(P) -> has_make_zerf_annotation(P) ->
case proplists:get_value(make_zerf, P#projection_v1.dbg2) of case proplists:get_value(make_zerf, P#projection_v1.dbg2) of