Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "socket operation on non-socket" at shutdown, by reverting #1935 #1991

Merged
merged 4 commits into from
Jan 29, 2022
Merged

Fix "socket operation on non-socket" at shutdown, by reverting #1935 #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de5629d
Revert "call quit method instead of quit event"
cyberw Jan 28, 2022
76407cb
Revert "remove duplicated quit event"
cyberw Jan 28, 2022
e053253
Revert "why raise error when call close func"
cyberw Jan 28, 2022
f6039f6
Revert "fix master runner not close rpc server"
cyberw Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions locust/runners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,6 @@ def quit(self):
logger.debug("Sending quit message to client %s" % (client.id))
self.server.send_to_client(Message("quit", None, client.id))
gevent.sleep(0.5) # wait for final stats report from all workers
self.server.close()
# ensure heartbeat_worker doesnt try to re-establish connection to workers and throw lots of exceptions
self.clients._worker_nodes = {}
self.greenlet.kill(block=True)

def check_stopped(self):
Expand Down
3 changes: 2 additions & 1 deletion locust/test/test_runners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def recv_from_client(self):
return msg.node_id, msg

def close(self):
pass
raise RPCError()

return MockedRpcServerClient

Expand Down Expand Up @@ -940,6 +940,7 @@ def _(*args, **kwargs):
self.assertEqual(2, worker.user_count)
# give time for users to generate stats, and stats to be sent to master
sleep(0.1)
master_env.events.quitting.fire(environment=master_env, reverse=True)
master.quit()
sleep(0.1)
# make sure users are killed
Expand Down