The warning is disabled until the next commit, because fixing it
results in a noisy diff due to indentation changes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/remotefilelog/connectionpool.py (2 lines) | |||
| M | mercurial/sshpeer.py (35 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron |
| pass | pass | ||||
| if conn is None: | if conn is None: | ||||
| peer = hg.peer(self._repo.ui, {}, path) | peer = hg.peer(self._repo.ui, {}, path) | ||||
| if util.safehasattr(peer, '_cleanup'): | if util.safehasattr(peer, '_cleanup'): | ||||
| class mypeer(peer.__class__): | class mypeer(peer.__class__): | ||||
| def _cleanup(self): | def _cleanup(self, warn=None): | ||||
| # close pipee first so peer.cleanup reading it won't | # close pipee first so peer.cleanup reading it won't | ||||
| # deadlock, if there are other processes with pipeo | # deadlock, if there are other processes with pipeo | ||||
| # open (i.e. us). | # open (i.e. us). | ||||
| if util.safehasattr(self, 'pipee'): | if util.safehasattr(self, 'pipee'): | ||||
| self.pipee.close() | self.pipee.close() | ||||
| return super(mypeer, self)._cleanup() | return super(mypeer, self)._cleanup() | ||||
| peer.__class__ = mypeer | peer.__class__ = mypeer | ||||
| @property | @property | ||||
| def closed(self): | def closed(self): | ||||
| return self._main.closed | return self._main.closed | ||||
| def flush(self): | def flush(self): | ||||
| return self._main.flush() | return self._main.flush() | ||||
| def _cleanuppipes(ui, pipei, pipeo, pipee): | def _cleanuppipes(ui, pipei, pipeo, pipee, warn): | ||||
| """Clean up pipes used by an SSH connection.""" | """Clean up pipes used by an SSH connection.""" | ||||
| if pipeo: | didsomething = False | ||||
| if pipeo and not pipeo.closed: | |||||
| didsomething = True | |||||
| pipeo.close() | pipeo.close() | ||||
| if pipei: | if pipei and not pipei.closed: | ||||
| didsomething = True | |||||
| pipei.close() | pipei.close() | ||||
| if pipee: | if pipee and not pipee.closed: | ||||
| didsomething = True | |||||
| # Try to read from the err descriptor until EOF. | # Try to read from the err descriptor until EOF. | ||||
| try: | try: | ||||
| for l in pipee: | for l in pipee: | ||||
| ui.status(_(b'remote: '), l) | ui.status(_(b'remote: '), l) | ||||
| except (IOError, ValueError): | except (IOError, ValueError): | ||||
| pass | pass | ||||
| pipee.close() | pipee.close() | ||||
| if didsomething and warn is not None: | |||||
| # Encourage explicit close of sshpeers. Closing via __del__ is | |||||
| # not very predictable when exceptions are thrown, which has led | |||||
| # to deadlocks due to a peer get gc'ed in a fork | |||||
| # We add our own stack trace, because the stacktrace when called | |||||
| # from __del__ is useless. | |||||
| if False: # enabled in next commit | |||||
| ui.develwarn( | |||||
| b'missing close on SSH connection created at:\n%s' % warn | |||||
| ) | |||||
| def _makeconnection(ui, sshcmd, args, remotecmd, path, sshenv=None): | def _makeconnection(ui, sshcmd, args, remotecmd, path, sshenv=None): | ||||
| """Create an SSH connection to a server. | """Create an SSH connection to a server. | ||||
| Returns a tuple of (process, stdin, stdout, stderr) for the | Returns a tuple of (process, stdin, stdout, stderr) for the | ||||
| spawned process. | spawned process. | ||||
| """ | """ | ||||
| cmd = b'%s %s %s' % ( | cmd = b'%s %s %s' % ( | ||||
| stdout = doublepipe(ui, util.bufferedinputpipe(stdout), stderr) | stdout = doublepipe(ui, util.bufferedinputpipe(stdout), stderr) | ||||
| stdin = doublepipe(ui, stdin, stderr) | stdin = doublepipe(ui, stdin, stderr) | ||||
| self._pipeo = stdin | self._pipeo = stdin | ||||
| self._pipei = stdout | self._pipei = stdout | ||||
| self._pipee = stderr | self._pipee = stderr | ||||
| self._caps = caps | self._caps = caps | ||||
| self._autoreadstderr = autoreadstderr | self._autoreadstderr = autoreadstderr | ||||
| self._initstack = b''.join(util.getstackframes(1)) | |||||
| # Commands that have a "framed" response where the first line of the | # Commands that have a "framed" response where the first line of the | ||||
| # response contains the length of that response. | # response contains the length of that response. | ||||
| _FRAMED_COMMANDS = { | _FRAMED_COMMANDS = { | ||||
| b'batch', | b'batch', | ||||
| } | } | ||||
| # Begin of ipeerconnection interface. | # Begin of ipeerconnection interface. | ||||
| def _readerr(self): | def _readerr(self): | ||||
| _forwardoutput(self.ui, self._pipee) | _forwardoutput(self.ui, self._pipee) | ||||
| def _abort(self, exception): | def _abort(self, exception): | ||||
| self._cleanup() | self._cleanup() | ||||
| raise exception | raise exception | ||||
| def _cleanup(self): | def _cleanup(self, warn=None): | ||||
| _cleanuppipes(self.ui, self._pipei, self._pipeo, self._pipee) | _cleanuppipes(self.ui, self._pipei, self._pipeo, self._pipee, warn=warn) | ||||
| __del__ = _cleanup | def __del__(self): | ||||
| self._cleanup(warn=self._initstack) | |||||
| def _sendrequest(self, cmd, args, framed=False): | def _sendrequest(self, cmd, args, framed=False): | ||||
| if self.ui.debugflag and self.ui.configbool( | if self.ui.debugflag and self.ui.configbool( | ||||
| b'devel', b'debug.peer-request' | b'devel', b'debug.peer-request' | ||||
| ): | ): | ||||
| dbg = self.ui.debug | dbg = self.ui.debug | ||||
| line = b'devel-peer-request: %s\n' | line = b'devel-peer-request: %s\n' | ||||
| dbg(line % cmd) | dbg(line % cmd) | ||||
| This function is factored out to allow creating peers that don't | This function is factored out to allow creating peers that don't | ||||
| actually spawn a new process. It is useful for starting SSH protocol | actually spawn a new process. It is useful for starting SSH protocol | ||||
| servers and clients via non-standard means, which can be useful for | servers and clients via non-standard means, which can be useful for | ||||
| testing. | testing. | ||||
| """ | """ | ||||
| try: | try: | ||||
| protoname, caps = _performhandshake(ui, stdin, stdout, stderr) | protoname, caps = _performhandshake(ui, stdin, stdout, stderr) | ||||
| except Exception: | except Exception: | ||||
| _cleanuppipes(ui, stdout, stdin, stderr) | _cleanuppipes(ui, stdout, stdin, stderr, warn=None) | ||||
| raise | raise | ||||
| if protoname == wireprototypes.SSHV1: | if protoname == wireprototypes.SSHV1: | ||||
| return sshv1peer( | return sshv1peer( | ||||
| ui, | ui, | ||||
| path, | path, | ||||
| proc, | proc, | ||||
| stdin, | stdin, | ||||
| proc, | proc, | ||||
| stdin, | stdin, | ||||
| stdout, | stdout, | ||||
| stderr, | stderr, | ||||
| caps, | caps, | ||||
| autoreadstderr=autoreadstderr, | autoreadstderr=autoreadstderr, | ||||
| ) | ) | ||||
| else: | else: | ||||
| _cleanuppipes(ui, stdout, stdin, stderr) | _cleanuppipes(ui, stdout, stdin, stderr, warn=None) | ||||
| raise error.RepoError( | raise error.RepoError( | ||||
| _(b'unknown version of SSH protocol: %s') % protoname | _(b'unknown version of SSH protocol: %s') % protoname | ||||
| ) | ) | ||||
| def instance(ui, path, create, intents=None, createopts=None): | def instance(ui, path, create, intents=None, createopts=None): | ||||
| """Create an SSH peer. | """Create an SSH peer. | ||||