This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1276

treemanifest: catch remote output during tree fetching
ClosedPublic

Authored by durham on Oct 31 2017, 7:14 PM.
Tags
None
Subscribers
phillco

Details

Reviewers
phillco
Group Reviewers
Restricted Project
Commits
rFBHGX48f98b586736: treemanifest: catch remote output during tree fetching
Summary

There was a flakey test because the remote stderr output was getting eaten part
of the time. This fixes it by capturing all the output and then sending it to
stderr manually.

Tested it by running all the tests in parallel multiple times and not seeing the
issue anymore.

Also we now send that output to the debug output. We're already throwing a more
useful error message, so let's hide the noise.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
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.Oct 31 2017, 7:14 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 31 2017, 7:14 PM
phillco accepted this revision.Nov 1 2017, 12:22 PM
phillco added a subscriber: phillco.
phillco added inline comments.
treemanifest/__init__.py
989

TIL, thanks.

This revision is now accepted and ready to land.Nov 1 2017, 12:22 PM
Closed by commit rFBHGX48f98b586736: treemanifest: catch remote output during tree fetching (authored by durham). · Explain WhyNov 2 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtreemanifest/__init__.py (6 lines)

Diff 3224

treemanifest/__init__.py

fallbackpath = repo.fallbackpath fallbackpath = repo.fallbackpath
else: else:
fallbackpath = repo.ui.config('paths', 'default') fallbackpath = repo.ui.config('paths', 'default')
start = time.time() start = time.time()
remote = hg.peer(repo.ui, {}, fallbackpath) remote = hg.peer(repo.ui, {}, fallbackpath)
if 'gettreepack' not in shallowutil.peercapabilities(remote): if 'gettreepack' not in shallowutil.peercapabilities(remote):
raise error.Abort(_("missing gettreepack capability on remote")) raise error.Abort(_("missing gettreepack capability on remote"))
remote.ui.pushbuffer()
phillcoUnsubmitted
Not Done

TIL, thanks.

phillco: TIL, thanks.
bundle = remote.gettreepack(rootdir, mfnodes, basemfnodes, directories) bundle = remote.gettreepack(rootdir, mfnodes, basemfnodes, directories)
try: try:
op = bundle2.processbundle(repo, bundle, None) op = bundle2.processbundle(repo, bundle, None)
receivednodes = op.records[RECEIVEDNODE_RECORD] receivednodes = op.records[RECEIVEDNODE_RECORD]
count = 0 count = 0
missingnodes = set(mfnodes) missingnodes = set(mfnodes)
if len(hexnodes) > 10: if len(hexnodes) > 10:
nodestr += '\n...' nodestr += '\n...'
raise error.Abort(_('unable to download the following trees from the ' raise error.Abort(_('unable to download the following trees from the '
'server:\n%s') % nodestr, hint=exc.hint) 'server:\n%s') % nodestr, hint=exc.hint)
except error.BundleValueError as exc: except error.BundleValueError as exc:
raise error.Abort(_('missing support for %s') % exc) raise error.Abort(_('missing support for %s') % exc)
finally: finally:
# Manually destruct the peer, so we can collect any error output # Manually destruct the peer, so we can collect any error output
remote.ui.pushbuffer()
remote._cleanup() remote._cleanup()
# Redirect cleanup output to the repo.ui so callers can buffer it if
# desired.
output = remote.ui.popbuffer() output = remote.ui.popbuffer()
if output: if output:
repo.ui.status(output) repo.ui.debug(output)
def _registerbundle2parts(): def _registerbundle2parts():
@bundle2.parthandler(TREEGROUP_PARTTYPE2, ('version', 'cache', 'category')) @bundle2.parthandler(TREEGROUP_PARTTYPE2, ('version', 'cache', 'category'))
def treeparthandler2(op, part): def treeparthandler2(op, part):
"""Handles received tree packs. If `cache` is True, the received """Handles received tree packs. If `cache` is True, the received
data goes in to the shared pack cache. Otherwise, the received data data goes in to the shared pack cache. Otherwise, the received data
goes into the permanent repo local data. goes into the permanent repo local data.
""" """