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

Get more aggressive about AllHosed+down nodes for inner proj

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-30 02:22:59 +09:00
parent 771164b82f
commit 0dc53274d1
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/machi_chain_manager1.erl
View file

@ -1369,13 +1369,17 @@ react_to_env_A30(Retries, P_latest, LatestUnanimousP, _ReadExtra,
a30_make_inner_projection(P_current, P_newprop3, P_latest, Up, a30_make_inner_projection(P_current, P_newprop3, P_latest, Up,
#ch_mgr{name=MyName, consistency_mode=CMode} = S) -> #ch_mgr{name=MyName, consistency_mode=CMode} = S) ->
AllHosed = get_all_hosed(P_newprop3), AllHosed = get_all_hosed(P_newprop3),
NewPropDown = P_newprop3#projection_v1.down,
P_current_has_inner_p = inner_projection_exists(P_current), P_current_has_inner_p = inner_projection_exists(P_current),
P_current_ios = inner_projection_or_self(P_current), P_current_ios = inner_projection_or_self(P_current),
AllHosed_and_Down = lists:usort(AllHosed ++ NewPropDown),
{P_i1, S_i, _Up} = calc_projection2(P_current_ios, {P_i1, S_i, _Up} = calc_projection2(P_current_ios,
MyName, AllHosed, [], S), MyName, AllHosed_and_Down, [], S),
?REACT({a30, ?LINE, [{raw_all_hosed,get_all_hosed(P_newprop3)}, ?REACT({a30, ?LINE, [{raw_all_hosed,get_all_hosed(P_newprop3)},
{up, Up}, {up, Up},
{all_hosed, AllHosed}, {all_hosed, AllHosed},
{new_prop_down, NewPropDown},
{all_hosed_and_down, AllHosed_and_Down},
{p_c_i, machi_projection:make_summary(P_current_ios)}, {p_c_i, machi_projection:make_summary(P_current_ios)},
{p_i1, machi_projection:make_summary(P_i1)}]}), {p_i1, machi_projection:make_summary(P_i1)}]}),
%% The inner projection will have a fake author, which %% The inner projection will have a fake author, which
@ -1489,7 +1493,7 @@ a30_make_inner_projection(P_current, P_newprop3, P_latest, Up,
P_newprop3#projection_v1.epoch_number; P_newprop3#projection_v1.epoch_number;
true -> true ->
P_oldinner = inner_projection_or_self(P_current), P_oldinner = inner_projection_or_self(P_current),
?REACT({a30xyzxyz, ?LINE, [P_oldinner#projection_v1.epoch_number + 1]}), ?REACT({a30xyzxyz, ?LINE, [{incrementing_based_on,P_oldinner#projection_v1.epoch_number + 1}]}),
FinalCreation = P_newprop3#projection_v1.creation_time, FinalCreation = P_newprop3#projection_v1.creation_time,
P_oldinner#projection_v1.epoch_number + 1 P_oldinner#projection_v1.epoch_number + 1
end, end,
@ -1766,7 +1770,7 @@ react_to_env_B10(Retries, P_newprop, P_latest, LatestUnanimousP,
(inner_projection_exists(P_latest) orelse (inner_projection_exists(P_latest) orelse
inner_projection_exists(P_newprop)) andalso inner_projection_exists(P_newprop)) andalso
%% I have been flapping for a while %% I have been flapping for a while
S#ch_mgr.flap_count > 100 andalso S#ch_mgr.flap_count > 200 andalso
%% I'm suspected of being bad %% I'm suspected of being bad
lists:member(MyName, P_newprop_AllHosedPlus) andalso lists:member(MyName, P_newprop_AllHosedPlus) andalso
%% I'm not in the critical UPI or repairing lists %% I'm not in the critical UPI or repairing lists
@ -2226,6 +2230,7 @@ react_to_env_C310(P_newprop, S) ->
calculate_flaps(P_newprop, P_latest, _P_current, CurrentUp, _FlapLimit, calculate_flaps(P_newprop, P_latest, _P_current, CurrentUp, _FlapLimit,
#ch_mgr{name=MyName, proj_history=H, #ch_mgr{name=MyName, proj_history=H,
consistency_mode=CMode,
flap_start=FlapStart, flap_start=FlapStart,
flap_count=FlapCount, flap_last_up=FlapLastUp, flap_count=FlapCount, flap_last_up=FlapLastUp,
flap_last_up_change=LastUpChange0, flap_last_up_change=LastUpChange0,
@ -2414,6 +2419,8 @@ calculate_flaps(P_newprop, P_latest, _P_current, CurrentUp, _FlapLimit,
AllHosed = lists:usort(HosedAnnotations ++ Magic), AllHosed = lists:usort(HosedAnnotations ++ Magic),
%%io:format(user, "ALLHOSED ~p: ~p ~w\n", [MyName, Magic, HosedAnnotations]), %%io:format(user, "ALLHOSED ~p: ~p ~w\n", [MyName, Magic, HosedAnnotations]),
?REACT({calculate_flaps,?LINE,[{new_flap_count,NewFlapCount}, ?REACT({calculate_flaps,?LINE,[{new_flap_count,NewFlapCount},
{bad_flus,BadFLUs},
{hosed_t_u_ts,HosedTransUnionTs},
{hosed_annotations,HosedAnnotations}, {hosed_annotations,HosedAnnotations},
{magic,Magic}, {magic,Magic},
{all_hosed,AllHosed}]}), {all_hosed,AllHosed}]}),
@ -2456,8 +2463,22 @@ calculate_flaps(P_newprop, P_latest, _P_current, CurrentUp, _FlapLimit,
flap_last_up=CurrentUp, flap_last_up_change=LastUpChange, flap_last_up=CurrentUp, flap_last_up_change=LastUpChange,
flap_counts_last=AllFlapCounts, flap_counts_last=AllFlapCounts,
runenv=RunEnv1}, runenv=RunEnv1},
{machi_projection:update_checksum(P_newprop#projection_v1{
flap=FlappingI}), P_newprop2 = case proplists:get_value(MyName, AllHosed) of
true when CMode == cp_mode ->
%% Experiment: try none proj but keep the epoch #.
?REACT({calculate_flaps,?LINE,[]}),
P_newprop#projection_v1{
upi=[], repairing=[],
down=P_newprop#projection_v1.all_members};
_ ->
?REACT({calculate_flaps,?LINE,[]}),
P_newprop
end,
?REACT({calculate_flaps,?LINE,[{zzz_1,P_newprop2#projection_v1.upi},
{zzz_2,P_newprop2#projection_v1.repairing},
{zzz_3,catch (P_newprop2#projection_v1.flap)#flap_i.all_hosed}]}),
{machi_projection:update_checksum(P_newprop2#projection_v1{flap=FlappingI}),
if AmFlapping_p -> if AmFlapping_p ->
S2; S2;
true -> true ->