This is an archive of the discontinued Mercurial Phabricator instance.

Differential D687

ssh: fix flakey ssh errors on BSD systems
ClosedPublic

Authored by durham on Sep 11 2017, 7:41 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHGc037fd655b47: ssh: fix flakey ssh errors on BSD systems
Summary

There's been a persistent issue with flakiness on BSD systems (like OSX) where
the 'no suitable response from remote hg' message would sometimes not appear.
This was caused by one of the earlier calls failing with a "IOError: Broken
pipe". Catching those errors and printing the same message removes the
flakiness.

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

durham created this revision.Sep 11 2017, 7:41 PM
durham added a comment.Sep 11 2017, 7:42 PM

Best viewed using the ignore-all-whitespace setting (in the History tab). https://phab.mercurial-scm.org/D687?vs=on&id=1743&whitespace=ignore-all#toc

quark accepted this revision.Sep 11 2017, 8:32 PM
quark added a subscriber: quark.

Looks reasonable. Thanks for tracking this down!

durin42 accepted this revision.Sep 11 2017, 9:17 PM
durin42 added a subscriber: durin42.

pushed with delight, may the solaris builders smile on us

This revision is now accepted and ready to land.Sep 11 2017, 9:17 PM
Closed by commit rHGc037fd655b47: ssh: fix flakey ssh errors on BSD systems (authored by durham). · Explain WhySep 11 2017, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (36 lines)

Diff 1746

mercurial/sshpeer.py

# move to threading. # move to threading.
sub = util.popen4(cmd, bufsize=0) sub = util.popen4(cmd, bufsize=0)
self._pipeo, self._pipei, self._pipee, self._subprocess = sub self._pipeo, self._pipei, self._pipee, self._subprocess = sub
self._pipei = util.bufferedinputpipe(self._pipei) self._pipei = util.bufferedinputpipe(self._pipei)
self._pipei = doublepipe(self.ui, self._pipei, self._pipee) self._pipei = doublepipe(self.ui, self._pipei, self._pipee)
self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee) self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee)
def badresponse():
self._abort(error.RepoError(_('no suitable response from '
'remote hg')))
try:
# skip any noise generated by remote shell # skip any noise generated by remote shell
self._callstream("hello") self._callstream("hello")
r = self._callstream("between", pairs=("%s-%s" % ("0"*40, "0"*40))) r = self._callstream("between", pairs=("%s-%s" % ("0"*40, "0"*40)))
except IOError:
badresponse()
lines = ["", "dummy"] lines = ["", "dummy"]
max_noise = 500 max_noise = 500
while lines[-1] and max_noise: while lines[-1] and max_noise:
try:
l = r.readline() l = r.readline()
self._readerr() self._readerr()
if lines[-1] == "1\n" and l == "\n": if lines[-1] == "1\n" and l == "\n":
break break
if l: if l:
self.ui.debug("remote: ", l) self.ui.debug("remote: ", l)
lines.append(l) lines.append(l)
max_noise -= 1 max_noise -= 1
except IOError:
badresponse()
else: else:
self._abort(error.RepoError(_('no suitable response from ' badresponse()
'remote hg')))
self._caps = set() self._caps = set()
for l in reversed(lines): for l in reversed(lines):
if l.startswith("capabilities:"): if l.startswith("capabilities:"):
self._caps.update(l[:-1].split(":")[1].split()) self._caps.update(l[:-1].split(":")[1].split())
break break
def _readerr(self): def _readerr(self):