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

Bugfix: A29 should trigger if EpochID (not Epoch# alone) differs

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-31 15:21:17 +09:00
parent 5422dc45c2
commit c637939cc2
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/machi_chain_manager1.erl
View file

@ -675,7 +675,6 @@ calc_projection(#ch_mgr{name=MyName, proj=P_current, consistency_mode=CMode,
calc_projection2(P_current, RelativeToServer, AllHosed, calc_projection2(P_current, RelativeToServer, AllHosed,
Dbg, S); Dbg, S);
{_, false} -> {_, false} ->
io:format(user, "KEEP ~w current ~w ~w ~w\n", [MyName, P_current#projection_v1.epoch_number, P_current#projection_v1.upi, P_current#projection_v1.repairing]),
{Up, Partitions, RunEnv2} = calc_up_nodes( {Up, Partitions, RunEnv2} = calc_up_nodes(
MyName, AllMembers, RunEnv), MyName, AllMembers, RunEnv),
%% We can't improve on the current projection. %% We can't improve on the current projection.
@ -1160,11 +1159,12 @@ react_to_env_A20(Retries, #ch_mgr{name=MyName}=S) ->
react_to_env_A29(Retries, P_latest, LatestUnanimousP, ReadExtra, react_to_env_A29(Retries, P_latest, LatestUnanimousP, ReadExtra,
#ch_mgr{name=MyName, consistency_mode=CMode, #ch_mgr{name=MyName, consistency_mode=CMode,
proj=P_current} = S) -> proj=P_current} = S) ->
#projection_v1{epoch_number=Epoch_latest, {Epoch_current,_} = EpochID_current =
author_server=Author_latest} = P_latest, machi_projection:get_epoch_id(P_current),
Trigger = if CMode == cp_mode, #projection_v1{author_server=Author_latest} = P_latest,
Epoch_latest > P_current#projection_v1.epoch_number, {Epoch_latest,_} = EpochID_latest = machi_projection:get_epoch_id(P_latest),
Author_latest /= MyName -> true = (Epoch_latest >= Epoch_current orelse Epoch_latest == 0), % sanity check
Trigger = if CMode == cp_mode, EpochID_latest /= EpochID_current ->
true; true;
true -> true ->
false false
@ -1724,6 +1724,8 @@ react_to_env_A50(P_latest, FinalProps, #ch_mgr{proj=P_current}=S) ->
{latest_epoch, P_latest#projection_v1.epoch_number}, {latest_epoch, P_latest#projection_v1.epoch_number},
{final_props, FinalProps}]}), {final_props, FinalProps}]}),
%% if S#ch_mgr.name == c -> io:format(user, "A50: ~w: ~p\n", [S#ch_mgr.name, get(react)]); true -> ok end, %% if S#ch_mgr.name == c -> io:format(user, "A50: ~w: ~p\n", [S#ch_mgr.name, get(react)]); true -> ok end,
%% V = case file:read_file("/tmp/moomoo") of {ok,_} -> true; _ -> false end,
%% if V, S#ch_mgr.name == c -> io:format("C110: ~w: ~p\n", [S#ch_mgr.name, get(react)]); true -> ok end,
{{no_change, FinalProps, P_current#projection_v1.epoch_number}, S}. {{no_change, FinalProps, P_current#projection_v1.epoch_number}, S}.
react_to_env_B10(Retries, P_newprop, P_latest, LatestUnanimousP, react_to_env_B10(Retries, P_newprop, P_latest, LatestUnanimousP,
@ -3474,6 +3476,8 @@ diversion_c120_verbose_goop2(P_latest0, S) ->
end. end.
perhaps_verbose_c110(P_latest2, S) -> perhaps_verbose_c110(P_latest2, S) ->
%% V = case file:read_file("/tmp/moomoo") of {ok,_} -> true; _ -> false end,
%% if V, S#ch_mgr.name == c -> io:format("C110: ~w: ~p\n", [S#ch_mgr.name, get(react)]); true -> ok end,
case proplists:get_value(private_write_verbose, S#ch_mgr.opts) of case proplists:get_value(private_write_verbose, S#ch_mgr.opts) of
true -> true ->
{_,_,C} = os:timestamp(), {_,_,C} = os:timestamp(),