# HG changeset patch
# User Jun Wu <qu...@fb.com>
# Date 1486593930 28800
# Wed Feb 08 14:45:30 2017 -0800
# Node ID cb56fce57eceef2cf4cd9893d387b9fe2b3cecd6
# Parent 5fc577761fb78168fcbd7ec93d911a1b7b4989c9
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/quark-zju/hg-draft -r cb56fce57ece
commandserver: handle backlog before exiting
Previously, when a chg server is exiting, it does not handle connected
clients so clients may get ECONNRESET and crash:
1. client connect() # success
2. server shouldexit = True and exit
3. client recv() # ECONNRESET
d7875bfbfccb makes this race condition easier to reproduce if a lot of short
chg commands are started in parallel.
This patch fixes the above issue by unlinking the socket path to stop
queuing new connections and processing all pending connections before exit.
diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -478,9 +478,21 @@ class unixforkingservice(object):
def _mainloop(self):
+ exiting = False
h = self._servicehandler
- while not h.shouldexit():
+ while True:
+ if not exiting and h.shouldexit():
+ # clients can no longer connect() to the domain socket, so
+ # we stop queuing new requests.
+ # for requests that are queued (connect()-ed, but haven't been
+ # accept()-ed), handle them before exit. otherwise, clients
+ # waiting for recv() will receive ECONNRESET.
+ self._servicehandler.unlinksocket(self.address)
+ exiting = True
try:
ready = select.select([self._sock], [], [], h.pollinterval)[0]
if not ready:
+ # only exit if we completed all queued requests
+ if exiting:
+ break
continue
conn, _addr = self._sock.accept()
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
