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

CP mode fix a30_make_inner_projection

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-23 16:43:15 +09:00
parent 2d050ff7a6
commit 0136fccff7
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/machi_chain_manager1.erl
View file

@ -1333,11 +1333,9 @@ a30_make_inner_projection(P_current, P_newprop3, P_latest, Up,
?REACT({a30, ?LINE, [{epoch_latest_i, Epoch_latest_i}, ?REACT({a30, ?LINE, [{epoch_latest_i, Epoch_latest_i},
{upi_latest_i, UPI_latest_i}, {upi_latest_i, UPI_latest_i},
{repairing_latest_i,Repairing_latest_i}]}), {repairing_latest_i,Repairing_latest_i}]}),
SameEnough_p = LatestSameEnough_p =
CMode == ap_mode (UPI_latest_i ++ Repairing_latest_i) ==
andalso (UPI_current_x ++ Repairing_current_x)
lists:usort(UPI_latest_i ++ Repairing_latest_i) ==
lists:usort(UPI_current_x ++ Repairing_current_x)
andalso andalso
Epoch_latest_i >= P_current_ios#projection_v1.epoch_number, Epoch_latest_i >= P_current_ios#projection_v1.epoch_number,
CurrentHasInner_and_LatestIsDisjoint_p = CurrentHasInner_and_LatestIsDisjoint_p =
@ -1346,7 +1344,7 @@ a30_make_inner_projection(P_current, P_newprop3, P_latest, Up,
ordsets:is_disjoint( ordsets:is_disjoint(
ordsets:from_list(UPI_current_x ++ Repairing_current_x), ordsets:from_list(UPI_current_x ++ Repairing_current_x),
ordsets:from_list(UPI_latest_i ++ Repairing_latest_i)), ordsets:from_list(UPI_latest_i ++ Repairing_latest_i)),
if SameEnough_p -> if LatestSameEnough_p ->
?REACT({a30, ?LINE, []}), ?REACT({a30, ?LINE, []}),
case P_current_has_inner_p andalso case P_current_has_inner_p andalso
(UPI_current_x /= P_i3#projection_v1.upi orelse (UPI_current_x /= P_i3#projection_v1.upi orelse
@ -3083,8 +3081,8 @@ perhaps_verbose_c110(P_latest2, S) ->
S#ch_mgr.opts) of S#ch_mgr.opts) of
true when Summ2 /= Last2 -> true when Summ2 /= Last2 ->
put(last_verbose, Summ2), put(last_verbose, Summ2),
?V("\n~2..0w:~2..0w:~2..0w.~3..0w ~p uses inner: ~w\n", ?V("\n~2..0w:~2..0w:~2..0w.~3..0w ~p uses inner: ~w (outer ~w)\n",
[HH,MM,SS,MSec, S#ch_mgr.name, Summ2]); [HH,MM,SS,MSec, S#ch_mgr.name, Summ2, P_latest2#projection_v1.epoch_number]);
_ -> _ ->
ok ok
end end