Merge pull request 'uw-handle-empty-nonces' (#8) from uw-handle-empty-nonces into master

Reviewed-on: #8
Reviewed-by: Jarvis Carroll <jarviscarrol@qpq.swiss>

ebin/gmhive_client.app

@@ -1,6 +1,6 @@
 {application,gmhive_client,
              [{description,"Gajumaru Hive Client"},
-              {vsn,"0.4.3"},
+              {vsn,"0.4.5"},
               {registered,[]},
               {applications,[kernel,stdlib,sasl,gproc,inets,ssl,enoise,
                              gmconfig,gmhive_protocol,gmhive_worker]},

src/gmhc_server.erl

@@ -107,13 +107,16 @@ handle_cast({from_pool, #{via := Connector,
     %% We could check whether we have already received the candidate ...
     %% For now, stop all workers, restart with new candidate
     try
-        % Most of the time we don't want to stop the worker. If we do, though, then
-        % we need to do it more carefully than this, or memory usage will triple.
-        % Workers1 = stop_workers(Workers),
-        {Workers2, Cand1} = assign_nonces(Workers, Cand),
-        #st{candidate = Cand2} = S1 = maybe_request_nonces(S#st{candidate = Cand1}),
-        NewWorkers = [spawn_worker(W, Cand2) || W <- Workers2],
-        {noreply, S1#st{workers = NewWorkers}}
+        %% Most of the time we don't want to stop the worker. If we do, though, then
+        %% we need to do it more carefully than this, or memory usage will triple.
+        %% Workers1 = stop_workers(Workers),
+        %%
+        %% Nonces may be [], in which case we need to request new nonces first.
+        #st{candidate = Cand1} = S1 = maybe_request_nonces(S#st{candidate = Cand}),
+        {Workers2, Cand2} = assign_nonces(Workers, Cand1),
+        #st{candidate = Cand3} = S2 = maybe_request_nonces(S1#st{candidate = Cand2}),
+        NewWorkers = [spawn_worker(W, Cand3) || W <- Workers2],
+        {noreply, S2#st{workers = NewWorkers}}
     catch
        Cat:Err:St ->
            ?LOG_ERROR("CAUGHT ~p:~p / ~p", [Cat, Err, St]),
@@ -272,13 +275,14 @@ incr_worker_error(#worker{errors = Es, index = I} = W, Ws) ->
     W1 = reset_worker_(W#worker{errors = Es+1}),
     lists:keyreplace(I, #worker.index, Ws, W1).
 
-maybe_continue(stopped, _, S) ->
-    S;
+%% maybe_continue(stopped, _, S) ->
+%%     S;
 maybe_continue(continue, W, S) ->
     maybe_restart_worker(W, S);
 maybe_continue(error, W, S) ->
     ?LOG_INFO("Won't restart worker ~p due to error", [W#worker.index]),
-    S.
+    Ws = reset_worker(W, S#st.workers),
+    S#st{workers = Ws}.
 
 maybe_restart_worker(#worker{index = I} = W, #st{candidate = C} = S) ->
     case maps:get(nonces, C) of
@@ -314,7 +318,7 @@ stop_workers_for_seq(Seq, Workers) ->
 stop_worker(#worker{pid = Pid} = W) when is_pid(Pid) ->
     MRef = erlang:monitor(process, Pid),
     ?LOG_DEBUG("Will stop worker ~p (MRef = ~p)", [Pid, MRef]),
-    exit(Pid, kill),
+    exit(Pid, shutdown),
     receive
         {'EXIT', Pid, _} -> ok;
         {'DOWN', MRef, process, Pid, _} -> ok

zomp.meta

@@ -4,7 +4,7 @@
 {prefix,"gmhc"}.
 {author,"Ulf Wiger, QPQ AG"}.
 {desc,"Gajumaru Hive Client"}.
-{package_id,{"uwiger","gmhive_client",{0,4,3}}}.
+{package_id,{"uwiger","gmhive_client",{0,4,5}}}.
 {deps,[{"uwiger","gmcuckoo",{1,2,3}},
        {"uwiger","gmhive_worker",{0,3,0}},
        {"otpr","eblake2",{1,0,1}},