From c69a20603989d5000cf5a5b6d76a4c9f76eb5cf6 Mon Sep 17 00:00:00 2001
From: Scott Lystig Fritchie <slfritchie@snookles.com>
Date: Wed, 5 Nov 2014 16:42:59 +0900
Subject: [PATCH] WIP: stuck, need to add even MORE repairing list, before
 continuing

---
 .../poc-machi/src/machi_chain_manager1.erl    |  6 ++++
 .../test/machi_chain_manager1_test.erl        | 36 +++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/prototype/poc-machi/src/machi_chain_manager1.erl b/prototype/poc-machi/src/machi_chain_manager1.erl
index 69d9d29..b414181 100644
--- a/prototype/poc-machi/src/machi_chain_manager1.erl
+++ b/prototype/poc-machi/src/machi_chain_manager1.erl
@@ -398,6 +398,7 @@ calc_projection(_OldThreshold, _NoPartitionThreshold, LastProj,
     {NewUPI_list3, Repairing_list3, RunEnv3} =
         case {NewUp, Repairing_list2} of
             {[], []} ->
+D_foo=[],
                 {NewUPI_list, [], RunEnv2};
             {[], [H|T]} when RelativeToServer == hd(NewUPI_list) ->
                 %% The author is head of the UPI list.  Let's see if the
@@ -411,14 +412,18 @@ calc_projection(_OldThreshold, _NoPartitionThreshold, LastProj,
                            andalso
                            (S#ch_mgr.proj)#projection.epoch_csum ==
                            RemotePrivateProj#projection.epoch_csum ->
+D_foo=[{repair_airquote_done, {we_agree, RemotePrivateProj#projection.epoch_number}}],
                                 {NewUPI_list ++ [H], T, RunEnv2};
                            true ->
+D_foo=[],
                                 {NewUPI_list, OldRepairing_list, RunEnv2}
                         end;
                     _ ->
+D_foo=[],
                         {NewUPI_list, OldRepairing_list, RunEnv2}
                 end;
             {_, _} ->
+D_foo=[],
                 {NewUPI_list, OldRepairing_list, RunEnv2}
         end,
     Repairing_list4 = case NewUp of
@@ -440,6 +445,7 @@ calc_projection(_OldThreshold, _NoPartitionThreshold, LastProj,
 
     P = make_projection(OldEpochNum + 1,
                         MyName, All_list, Down, NewUPI, NewRepairing,
+                        D_foo ++
                         Dbg ++ [{nodes_up, Up}]),
     {P, S#ch_mgr{runenv=RunEnv3}}.
 
diff --git a/prototype/poc-machi/test/machi_chain_manager1_test.erl b/prototype/poc-machi/test/machi_chain_manager1_test.erl
index c0f917e..1b7c6d0 100644
--- a/prototype/poc-machi/test/machi_chain_manager1_test.erl
+++ b/prototype/poc-machi/test/machi_chain_manager1_test.erl
@@ -239,8 +239,9 @@ zoof_test() ->
         R_Chains = [extract_chains_relative_to_flu(FLU, Report) ||
                        FLU <- All_list],
         ?D(R_Chains),
-        R_Projs = [{FLU, [chain_to_projection(FLU, Epoch, Chain, All_list) ||
-                             {Epoch, Chain} <- E_Chains]} ||
+        R_Projs = [{FLU, [chain_to_projection(FLU, Epoch, UPI, Repairing,
+                                              All_list) ||
+                             {Epoch, UPI, Repairing} <- E_Chains]} ||
                       {FLU, E_Chains} <- R_Chains],
         [{FLU, true} = {FLU, machi_chain_manager0_test:projection_transitions_are_sane(Ps)} || {FLU, Ps} <- R_Projs],
         ?D(R_Projs),
@@ -266,13 +267,15 @@ unanimous_report(Epoch, Namez) ->
                            {ok, T} -> T;
                            _Else   -> not_in_this_epoch
                        end} || {FLUName, FLU} <- Namez],
-    UPI_Sums = [{Proj#projection.upi, Proj#projection.epoch_csum} ||
-                   {_FLUname, Proj} <- Projs,
-                   is_record(Proj, projection)],
-    UniqueUPIs = lists:usort([UPI || {UPI, _CSum} <- UPI_Sums]),
+    UPI_R_Sums = [{Proj#projection.upi, Proj#projection.repairing,
+                   Proj#projection.epoch_csum} ||
+                     {_FLUname, Proj} <- Projs,
+                     is_record(Proj, projection)],
+    UniqueUPIs = lists:usort([UPI || {UPI, _Repairing, _CSum} <- UPI_R_Sums]),
     Res =
         [begin
-             case lists:usort([CSum || {U, CSum} <- UPI_Sums, U == UPI]) of
+             case lists:usort([CSum || {U, _Repairing, CSum} <- UPI_R_Sums,
+                                       U == UPI]) of
                  [_] ->
                      %% Yay, there's only 1 checksum.  Let's check
                      %% that all FLUs are in agreement.
@@ -282,11 +285,13 @@ unanimous_report(Epoch, Namez) ->
                                       Else ->
                                           Else
                                   end} || FLU <- UPI],
+                     {UPI, Repairing, _CSum} =
+                         lists:keyfind(UPI, 1, UPI_R_Sums),
                      case lists:usort([CSum || {_FLU, CSum} <- Tmp]) of
                          [_] ->
-                             {agreed_membership, UPI};
+                             {agreed_membership, {UPI, Repairing}};
                          Else2 ->
-                             {not_agreed, UPI, Else2}
+                             {not_agreed, {UPI, Repairing}, Else2}
                      end;
                  _Else ->
                      {UPI, not_unique, Epoch, _Else}
@@ -307,13 +312,14 @@ all_reports_are_disjoint(Report) ->
                 element(1, Tuple) /= ok_disjoint].
 
 extract_chains_relative_to_flu(FLU, Report) ->
-    {FLU, [{Epoch, UPI} || {Epoch, {ok_disjoint, Es}} <- Report,
-                           {agreed_membership, UPI} <- Es,
-                           lists:member(FLU, UPI)]}.
+    {FLU, [{Epoch, UPI, Repairing} ||
+              {Epoch, {ok_disjoint, Es}} <- Report,
+              {agreed_membership, {UPI, Repairing}} <- Es,
+              lists:member(FLU, UPI)]}.
 
-chain_to_projection(MyName, Epoch, UPI_list, All_list) ->
+chain_to_projection(MyName, Epoch, UPI_list, Repairing_list, All_list) ->
     ?MGR:make_projection(Epoch, MyName, All_list,
-                         All_list -- UPI_list, % hack for down list
-                         UPI_list, [], []).
+                         All_list -- (UPI_list ++ Repairing_list),
+                         UPI_list, Repairing_list, []).
 
 -endif.