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

WIP: server-side of CP mode repairing-as-witness

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-09-21 19:52:39 +09:00
parent d9b9397e75
commit 340af05f0f
1 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/machi_chain_manager1.erl
View file

@ -640,7 +640,7 @@ rank_and_sort_projections_with_extra(All_queried_list, FLUsRs, ProjectionType,
{not_unanimous_flus, All_queried_list -- {not_unanimous_flus, All_queried_list --
(Best_FLUs ++ BadAnswerFLUs)}, (Best_FLUs ++ BadAnswerFLUs)},
{bad_answer_flus, BadAnswerFLUs}, {bad_answer_flus, BadAnswerFLUs},
{bad_answers, BadAnswers}, {bad_answers, BadAnswers2},
{not_best_ps, NotBestPs}, {not_best_ps, NotBestPs},
{not_best_ps_epoch_filt, NotBestPsEpochFilt}|Extra], {not_best_ps_epoch_filt, NotBestPsEpochFilt}|Extra],
{UnanimousTag, BestProj, Extra2, S} {UnanimousTag, BestProj, Extra2, S}
@ -681,25 +681,29 @@ calc_projection(#ch_mgr{name=MyName, consistency_mode=CMode,
if CMode == ap_mode -> if CMode == ap_mode ->
calc_projection2(P_current, RelativeToServer, AllHosed, Dbg, S); calc_projection2(P_current, RelativeToServer, AllHosed, Dbg, S);
CMode == cp_mode -> CMode == cp_mode ->
#projection_v1{epoch_number=OldEpochNum, calc_projection2(P_current, RelativeToServer, AllHosed, Dbg, S)
all_members=AllMembers, %% TODO EXPERIMENT 2015-09-21 DELETE-ME???
upi=OldUPI_list %% #projection_v1{epoch_number=OldEpochNum,
} = P_current, %% all_members=AllMembers,
UPI_length_ok_p = %% upi=OldUPI_list,
length(OldUPI_list) >= full_majority_size(AllMembers), %% upi=OldRepairing_list
case {OldEpochNum, UPI_length_ok_p} of %% } = P_current,
{0, _} -> %% OldUPI_and_Repairing = OldUPI_list ++ OldRepairing_list,
calc_projection2(P_current, RelativeToServer, AllHosed, %% UPI_and_Repairing_length_ok_p =
Dbg, S); %% length(OldUPI_and_Repairing) >= full_majority_size(AllMembers),
{_, true} -> %% case {OldEpochNum, UPI_length_ok_p} of
calc_projection2(P_current, RelativeToServer, AllHosed, %% {0, _} ->
Dbg, S); %% calc_projection2(P_current, RelativeToServer, AllHosed,
{_, false} -> %% Dbg, S);
{Up, _Partitions, RunEnv2} = calc_up_nodes( %% {_, true} ->
MyName, AllMembers, RunEnv), %% calc_projection2(P_current, RelativeToServer, AllHosed,
%% We can't improve on the current projection. %% Dbg, S);
{P_current, S#ch_mgr{runenv=RunEnv2}, Up} %% {_, false} ->
end %% {Up, _Partitions, RunEnv2} = calc_up_nodes(
%% MyName, AllMembers, RunEnv),
%% %% We can't improve on the current projection.
%% {P_current, S#ch_mgr{runenv=RunEnv2}, Up}
%% end
end. end.
%% AllHosed: FLUs that we must treat as if they are down, e.g., we are %% AllHosed: FLUs that we must treat as if they are down, e.g., we are
@ -818,7 +822,9 @@ calc_projection2(LastProj, RelativeToServer, AllHosed, Dbg,
P2 = if CMode == cp_mode -> P2 = if CMode == cp_mode ->
UpWitnesses = [W || W <- Up, lists:member(W, OldWitness_list)], UpWitnesses = [W || W <- Up, lists:member(W, OldWitness_list)],
Majority = full_majority_size(AllMembers), Majority = full_majority_size(AllMembers),
SoFar = length(NewUPI), %% A repairing node can also contribute to the quorum
%% majority required to attest to the history of the UPI.
SoFar = length(NewUPI ++ NewRepairing),
if SoFar >= Majority -> if SoFar >= Majority ->
?REACT({calc,?LINE,[]}), ?REACT({calc,?LINE,[]}),
P; P;
@ -2261,11 +2267,16 @@ projection_transition_is_sane_except_si_epoch(
%% CP mode extra sanity checks %% CP mode extra sanity checks
if CMode1 == cp_mode -> if CMode1 == cp_mode ->
Majority = full_majority_size(All_list2), Majority = full_majority_size(All_list2),
UPI2_and_Repairing2 = UPI_list2 ++ Repairing_list2,
if length(UPI_list2) == 0 -> if length(UPI_list2) == 0 ->
ok; % none projection ok; % none projection
length(UPI_list2) >= Majority -> length(UPI2_and_Repairing2) >= Majority ->
%% We have at least one non-witness %% We are assuming here that the client side is smart
true = (length(UPI_list2 -- Witness_list2) > 0); %% enough to do the *safe* thing when the
%% length(UPI_list2) < Majority ... the client must use
%% the repairing nodes both as witnesses to check the
%% current epoch.
ok;
true -> true ->
error({majority_not_met, UPI_list2}) error({majority_not_met, UPI_list2})
end; end;
@ -2786,7 +2797,9 @@ make_zerf2(OldEpochNum, Up, MajoritySize, MyName, AllMembers, OldWitness_list,
try try
#projection_v1{epoch_number=Epoch} = Proj = #projection_v1{epoch_number=Epoch} = Proj =
zerf_find_last_common(MajoritySize, Up, S), zerf_find_last_common(MajoritySize, Up, S),
Proj2 = Proj#projection_v1{dbg2=[{make_zerf,Epoch}]}, Proj2 = Proj#projection_v1{dbg2=[{make_zerf,Epoch},
{yyy_hack, get(yyy_hack)},
{up,Up},{maj,MajoritySize}]},
%% io:format(user, "ZERF ~w\n",[machi_projection:make_summary(Proj2)]), %% io:format(user, "ZERF ~w\n",[machi_projection:make_summary(Proj2)]),
Proj2 Proj2
catch catch
@ -2847,7 +2860,9 @@ zerf_find_last_annotated(FLU, MajoritySize, S) ->
(catch put(yyy_hack, [{FLU, Epoch, ok2}|get(yyy_hack)])), (catch put(yyy_hack, [{FLU, Epoch, ok2}|get(yyy_hack)])),
Proj Proj
end, end,
if length(Px#projection_v1.upi) >= MajoritySize -> UPI_and_Repairing = Px#projection_v1.upi ++
Px#projection_v1.repairing,
if length(UPI_and_Repairing) >= MajoritySize ->
(catch put(yyy_hack, [{FLU, Epoch, yay}|get(yyy_hack)])), (catch put(yyy_hack, [{FLU, Epoch, yay}|get(yyy_hack)])),
Px; Px;
true -> true ->