Fix for correctness bug, thanks PULSE
This commit is contained in:
parent
be62300b3b
commit
9bf76e0bfb
1 changed files with 9 additions and 9 deletions
|
@ -1314,15 +1314,15 @@ react_to_env_C100(P_newprop, P_latest,
|
||||||
I_am_UPI_in_newprop_p = lists:member(MyName, P_newprop#projection_v1.upi),
|
I_am_UPI_in_newprop_p = lists:member(MyName, P_newprop#projection_v1.upi),
|
||||||
I_am_Repairing_in_latest_p = lists:member(MyName,
|
I_am_Repairing_in_latest_p = lists:member(MyName,
|
||||||
P_latest#projection_v1.repairing),
|
P_latest#projection_v1.repairing),
|
||||||
ShortCircuit_p =
|
%% TODO: ShortCircuit_p was a bad idea, I'm nearly sure. Get rid of it.
|
||||||
P_latest#projection_v1.epoch_number > P_current#projection_v1.epoch_number
|
ShortCircuit_p = false,
|
||||||
andalso
|
|
||||||
I_am_UPI_in_newprop_p
|
|
||||||
andalso
|
|
||||||
I_am_Repairing_in_latest_p,
|
|
||||||
|
|
||||||
Current_sane_p = projection_transition_is_sane(P_current, P_latest,
|
Current_sane_p = projection_transition_is_sane(P_current, P_latest,
|
||||||
MyName),
|
MyName),
|
||||||
|
put(xxx_hack, [{p_current, machi_projection:make_summary(P_current)},
|
||||||
|
{epoch_compare, P_latest#projection_v1.epoch_number > P_current#projection_v1.epoch_number},
|
||||||
|
{i_am_upi_in_newprop_p, I_am_UPI_in_newprop_p},
|
||||||
|
{i_am_repairing_in_latest_p, I_am_Repairing_in_latest_p},
|
||||||
|
{shortcircuit_p, ShortCircuit_p}]),
|
||||||
case {ShortCircuit_p, Current_sane_p} of
|
case {ShortCircuit_p, Current_sane_p} of
|
||||||
_ when P_current#projection_v1.epoch_number == 0 ->
|
_ when P_current#projection_v1.epoch_number == 0 ->
|
||||||
%% Epoch == 0 is reserved for first-time, just booting conditions.
|
%% Epoch == 0 is reserved for first-time, just booting conditions.
|
||||||
|
@ -1351,7 +1351,8 @@ react_to_env_C100(P_newprop, P_latest,
|
||||||
|
|
||||||
react_to_env_C110(P_latest, #ch_mgr{name=MyName} = S) ->
|
react_to_env_C110(P_latest, #ch_mgr{name=MyName} = S) ->
|
||||||
?REACT(c110),
|
?REACT(c110),
|
||||||
Extra_todo = [],
|
%% Extra_todo = [],
|
||||||
|
Extra_todo = get(xxx_hack),
|
||||||
%% Extra_todo = [{hee, lists:reverse(get(react))}],
|
%% Extra_todo = [{hee, lists:reverse(get(react))}],
|
||||||
P_latest2 = machi_projection:update_dbg2(P_latest, Extra_todo),
|
P_latest2 = machi_projection:update_dbg2(P_latest, Extra_todo),
|
||||||
|
|
||||||
|
@ -1888,7 +1889,6 @@ projection_transition_is_sane(
|
||||||
%% If there's no overlap at all between
|
%% If there's no overlap at all between
|
||||||
%% UPI_list1 & UPI_list2, then we're OK
|
%% UPI_list1 & UPI_list2, then we're OK
|
||||||
%% here.
|
%% here.
|
||||||
io:format(user, "QQQ Oops_check_UPI_2_suffix=~w, ", [Oops_check_UPI_2_suffix]),
|
|
||||||
true;
|
true;
|
||||||
true ->
|
true ->
|
||||||
exit({upi_2_suffix_error, UPI_2_suffix})
|
exit({upi_2_suffix_error, UPI_2_suffix})
|
||||||
|
|
Loading…
Reference in a new issue