This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9997

remotefilelog: rework workaround for sshpeer deadlocks
ClosedPublic

Authored by valentin.gatienbaron on Feb 15 2021, 4:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0509cee38757: remotefilelog: rework workaround for sshpeer deadlocks
rHG2590032f982e: remotefilelog: rework workaround for sshpeer deadlocks
Summary

The wrapping of sshpeer.cleanup silently broke when cleanup was
renamed to _cleanup, a couple of years ago.

I don't know what orig.im_self is, but regardless, the intention of
the wrapping seems pretty clear: close stderr before
sshpeer._cleanuppipes blocks on it. So do that.

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.

Revision Contents
Changeset List

Diff 26151

hgext/remotefilelog/connectionpool.py

if isinstance(peer, _sshv1peer): if isinstance(peer, _sshv1peer):
if peer._subprocess.poll() is not None: if peer._subprocess.poll() is not None:
conn = None conn = None
except IndexError: except IndexError:
pass pass
if conn is None: if conn is None:
def _cleanup(orig):
# close pipee first so peer.cleanup reading it won't deadlock,
# if there are other processes with pipeo open (i.e. us).
peer = orig.im_self
if util.safehasattr(peer, 'pipee'):
peer.pipee.close()
return orig()
peer = hg.peer(self._repo.ui, {}, path) peer = hg.peer(self._repo.ui, {}, path)
if util.safehasattr(peer, 'cleanup'): if util.safehasattr(peer, '_cleanup'):
extensions.wrapfunction(peer, b'cleanup', _cleanup)
class mypeer(peer.__class__):
def _cleanup(self):
# close pipee first so peer.cleanup reading it won't
# deadlock, if there are other processes with pipeo
# open (i.e. us).
if util.safehasattr(self, 'pipee'):
self.pipee.close()
return super(mypeer, self)._cleanup()
peer.__class__ = mypeer
conn = connection(pathpool, peer) conn = connection(pathpool, peer)
return conn return conn
def close(self): def close(self):
for pathpool in pycompat.itervalues(self._pool): for pathpool in pycompat.itervalues(self._pool):
for conn in pathpool: for conn in pathpool: