Merge 74d9466 into 8103875

riak-core-lite · Aug 6, 2020 · d9b8c5f · d9b8c5f
2 parents 8103875 + 74d9466
commit d9b8c5f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/riak_core_vnode_worker_pool.erl b/src/riak_core_vnode_worker_pool.erl
@@ -317,8 +317,11 @@ worker_started(#state{pool = Pool,
                  State#state{queue = Rem, monitors = NewMonitors}}
           end;
       {empty, _} ->
-          %% StateName might be either 'ready' or 'shutdown'
-          {next_state, StateName, State}
+          {next_state, 
+	   %% If we are in state queueing with nothing in the queue,
+	   %% move to the ready state so that the next incoming job
+	   %% checks out the new worker from poolboy.
+	   if StateName==queue -> ready; true -> StateName end, State}
     end.
 
 checkin(#state{pool = Pool, monitors = Monitors} =