This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3720

commandserver: close server's fds explicitly from a worker
ClosedPublic

Authored by quark on Jun 12 2018, 3:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc07424ec633c: commandserver: close server's fds explicitly from a worker
Summary

The forked worker does not need to accept connections from the server's
socket fd. So let's just close them explicitly to avoid surprises.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Jun 12 2018, 3:42 PM
Closed by commit rHGc07424ec633c: commandserver: close server's fds explicitly from a worker (authored by quark). · Explain WhyJun 13 2018, 8:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commandserver.py (2 lines)

Diff 9042

mercurial/commandserver.py

try: try:
self.ui.debug('forked worker process (pid=%d)\n' % pid) self.ui.debug('forked worker process (pid=%d)\n' % pid)
self._workerpids.add(pid) self._workerpids.add(pid)
h.newconnection() h.newconnection()
finally: finally:
conn.close() # release handle in parent process conn.close() # release handle in parent process
else: else:
try: try:
selector.close()
self._sock.close()
self._runworker(conn) self._runworker(conn)
conn.close() conn.close()
os._exit(0) os._exit(0)
except: # never return, hence no re-raises except: # never return, hence no re-raises
try: try:
self.ui.traceback(force=True) self.ui.traceback(force=True)
finally: finally:
os._exit(255) os._exit(255)