Merge pull request #2116 from renato-farias/fix/stopping_hang_state

fix: stopping state when running more than one worker node.
locustio · Jun 16, 2022 · 08a2277 · 08a2277
2 parents 87385be + ea83a14
commit 08a2277
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/locust/runners.py b/locust/runners.py
@@ -886,7 +886,23 @@ def check_stopped(self) -> None:
         if (
             not self.state == STATE_INIT
             and not self.state == STATE_STOPPED
-            and all(map(lambda x: x.state not in (STATE_RUNNING, STATE_SPAWNING, STATE_INIT), self.clients.all))
+            and (
+                (
+                    self.state == STATE_STOPPING
+                    and all(
+                        map(
+                            lambda x: x.state == STATE_INIT,
+                            self.clients.all,
+                        )
+                    )
+                )
+            )
+            or all(
+                map(
+                    lambda x: x.state not in (STATE_RUNNING, STATE_SPAWNING, STATE_INIT),
+                    self.clients.all,
+                )
+            )
         ):
             self.update_state(STATE_STOPPED)
 

diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py
@@ -1619,6 +1619,34 @@ def tick(self):
                 self.assertEqual(2, worker.user_count, "Shape test has not started again correctly")
             master.stop()
 
+    def test_distributed_stop_with_stopping_state(self):
+        """
+        Test stopping state when workers have stopped and now ready for a next test
+        """
+
+        class TestUser(User):
+            @task
+            def my_task(self):
+                pass
+
+        with mock.patch("locust.runners.WORKER_REPORT_INTERVAL", new=0.3):
+            master_env = Environment(user_classes=[TestUser])
+            master = master_env.create_master_runner("*", 0)
+
+            workers = []
+            for i in range(3):
+                worker_env = Environment(user_classes=[TestUser])
+                worker = worker_env.create_worker_runner("127.0.0.1", master.server.port)
+                workers.append(worker)
+
+        for worker in workers:
+            worker.send_message("client_stopped", None)
+
+        sleep(1)
+        for worker in workers:
+            self.assertEqual(STATE_INIT, worker.state, "Worker sent a client_stopped, should be ready once stopped")
+        self.assertEqual(STATE_STOPPED, master.state)
+
     def test_distributed_shape_statuses_transition(self):
         """
         Full integration test that starts both a MasterRunner and five WorkerRunner instances