Worker quitting then stopping via web UI bug fix

locust/runners.py

@@ -405,10 +405,11 @@ def start(self, locust_count, hatch_rate):
         self.state = STATE_HATCHING
 
     def stop(self):
-        self.state = STATE_STOPPING
-        for client in self.clients.all:
-            self.server.send_to_client(Message("stop", None, client.id))
-        self.environment.events.test_stop.fire(environment=self.environment)
+        if self.state not in [STATE_INIT, STATE_STOPPED, STATE_STOPPING]:
+            self.state = STATE_STOPPING
+            for client in self.clients.all:
+                self.server.send_to_client(Message("stop", None, client.id))
+            self.environment.events.test_stop.fire(environment=self.environment)
 
     def quit(self):
         if self.state not in [STATE_INIT, STATE_STOPPED, STATE_STOPPING]:
@@ -490,6 +491,8 @@ def client_listener(self):
                 if msg.node_id in self.clients:
                     del self.clients[msg.node_id]
                     logger.info("Client %r quit. Currently %i clients connected." % (msg.node_id, len(self.clients.ready)))
+                    if self.worker_count == 0:
+                        self.stop()
             elif msg.type == "exception":
                 self.log_exception(msg.node_id, msg.data["msg"], msg.data["traceback"])
 

locust/web.py

@@ -25,7 +25,7 @@
 from io import StringIO
 
 from . import runners
-from .runners import MasterLocustRunner
+from .runners import MasterLocustRunner, STATE_STOPPING, STATE_STOPPED
 from .stats import failures_csv, median_from_dict, requests_csv, sort_stats
 from .util.cache import memoize
 from .util.rounding import proper_round
@@ -125,8 +125,11 @@ def swarm():
         @app.route('/stop')
         @self.auth_required_if_enabled
         def stop():
-            environment.runner.stop()
-            return jsonify({'success':True, 'message': 'Test stopped'})
+            if environment.runner.state in [STATE_STOPPING, STATE_STOPPED]:
+                return jsonify({'success':True, 'message': f"Test already {environment.runner.state}"})
+            else:
+                environment.runner.stop()
+                return jsonify({'success':True, 'message': 'Test stopped'})
 
         @app.route("/stats/reset")
         @self.auth_required_if_enabled