facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

connectionpool: fix wrapping of cleanup

Browse Source 
Summary:
Upstream Mercurial renamed peer.cleanup to peer._cleanup last August,
but our connectionpool logic wasn't updated. This meant that expired connections
were left alive and just hanging there until the process died. This defeated the
entire purpose of expiring connections (to free memory on the server).

Reviewed By: singhsrb

Differential Revision: D8583327

fbshipit-source-id: 561b6ed8b76247d996051b0536c5f58050fb83a2
This commit is contained in:
Durham Goode 2018-06-21 23:07:05 -07:00 committed by Facebook Github Bot
parent 95738ac0b8
commit ef629e5a8a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mercurial/connectionpool.py
View File

@ -61,16 +61,16 @@ class connectionpool(object):
if conn is None:
def _cleanup(orig):
# close pipee first so peer.cleanup reading it won't deadlock,
# 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()
if util.safehasattr(peer, "_pipee"):
peer._pipee.close()
return orig()
peer = hg.peer(self._repo.ui, {}, path)
if util.safehasattr(peer, "cleanup"):
extensions.wrapfunction(peer, "cleanup", _cleanup)
if util.safehasattr(peer, "_cleanup"):
extensions.wrapfunction(peer, "_cleanup", _cleanup)
conn = connection(self._repo.ui, pathpool, peer, path)
@ -94,8 +94,8 @@ class standaloneconnection(object):
self.close()
def close(self):
if util.safehasattr(self.peer, "cleanup"):
self.peer.cleanup()
if util.safehasattr(self.peer, "_cleanup"):
self.peer._cleanup()
class connection(object):
@ -128,5 +128,5 @@ class connection(object):
return self.expiry is not None and time.time() > self.expiry
def close(self):
if util.safehasattr(self.peer, "cleanup"):
self.peer.cleanup()
if util.safehasattr(self.peer, "_cleanup"):
self.peer._cleanup()