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

Fix repair bug that has survived witness additions, oops

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-08-14 19:30:36 +09:00
parent 9e02a1ea73
commit d2ce8f8447
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/machi_chain_manager1.erl
View file

@ -697,7 +697,7 @@ calc_projection2(LastProj, RelativeToServer, AllHosed, Dbg,
Simulator_p = proplists:get_value(use_partition_simulator, RunEnv2, false), Simulator_p = proplists:get_value(use_partition_simulator, RunEnv2, false),
SimRepair_p = proplists:get_value(simulate_repair, RunEnv2, true), SimRepair_p = proplists:get_value(simulate_repair, RunEnv2, true),
{NewUPI_list3, Repairing_list3, RunEnv3} = {NewUPI_list3, Repairing_list3, RunEnv3} =
case {NewUp, Repairing_list2} of case {NewUp -- OldWitness_list, Repairing_list2} of
{[], []} -> {[], []} ->
D_foo=[d_foo1], D_foo=[d_foo1],
{NewUPI_list, [], RunEnv2}; {NewUPI_list, [], RunEnv2};
@ -726,7 +726,7 @@ calc_projection2(LastProj, RelativeToServer, AllHosed, Dbg,
D_foo=[d_foo2], D_foo=[d_foo2],
{NewUPI_list, OldRepairing_list, RunEnv2} {NewUPI_list, OldRepairing_list, RunEnv2}
end; end;
{_, _} -> {_ABC, _XYZ} ->
D_foo=[d_foo3, {new_upi_list, NewUPI_list}, {new_up, NewUp}, {repairing_list3, OldRepairing_list}], D_foo=[d_foo3, {new_upi_list, NewUPI_list}, {new_up, NewUp}, {repairing_list3, OldRepairing_list}],
{NewUPI_list, OldRepairing_list, RunEnv2} {NewUPI_list, OldRepairing_list, RunEnv2}
end, end,