WIP: giant hairball 11

src/machi_flu1_client.erl

@@ -632,8 +632,8 @@ io:format(user, "\nCCC Req ~p\n", [Req]),
                 io:format(user, "\nCCC ReqID2 ~p Reply ~p\n", [ReqID2, Reply]),
                 true = (ReqID == ReqID2 orelse ReqID2 == <<>>),
                 Reply;
-            Else ->
-                {error, Else}
+            {error, _}=Err ->
+                throw(Err)
         end
     catch
         throw:Error ->

src/machi_proxy_flu1_client.erl

@@ -306,9 +306,6 @@ do_req(Req, Depth, S) ->
                     {ok, S2};
                 T when element(1, T) == ok ->
                     {T, S2};
-                %% {error, {badmatch, {badmatch, {error, Why}=TheErr}, _Stk}}
-                %%   when Why == closed; Why == timeout ->
-                %%     do_req_retry(Req, Depth, TheErr, S2);
                 TheErr ->
                     case get(bad_sock) of
                         Bad when Bad == S2#state.sock ->

test/machi_pb_test.erl

@@ -38,10 +38,10 @@
 %% message types/names here.
 
 smoke_requests_test() ->
-    Echo0 = #mpb_request{req_id= <<"x">>,
+    Echo0 = #mpb_request{req_id= <<"x">>, do_not_alter=1,
                          echo=#mpb_echoreq{}},
     Echo0 = encdec_request(Echo0),
-    Echo1 = #mpb_request{req_id= <<"x">>,
+    Echo1 = #mpb_request{req_id= <<"x">>, do_not_alter=1,
                          echo=#mpb_echoreq{message="Yo!"}},
     Echo1 = encdec_request(Echo1),
 

test/machi_proxy_flu1_client_test.erl

@@ -51,12 +51,9 @@ api_smoke_test() ->
                                           infinity) || _ <- lists:seq(1,5)],
             %% Stop the FLU, what happens?
             machi_flu1:stop(FLU1),
-            {error,_} = ?MUT:append_chunk(Prox1,
+            [{error,partition} = ?MUT:append_chunk(Prox1,
                                 FakeEpoch, Prefix, <<"data-stopped1">>,
-                                infinity),
-            {error,partition} = ?MUT:append_chunk(Prox1,
-                                FakeEpoch, Prefix, <<"data-stopped2">>,
-                                infinity),
+                                infinity) || _ <- lists:seq(1,3)],
             %% Start the FLU again, we should be able to do stuff immediately
             FLU1b = machi_flu1_test:setup_test_flu(RegName, TcpPort, DataDir,
                                                    [save_data_dir|W_props]),