This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4440

wireprotov2peer: report exceptions in frame handling against request future
ClosedPublic

Authored by indygreg on Aug 31 2018, 6:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG42bc1c70a6b8: wireprotov2peer: report exceptions in frame handling against request future
Summary

Otherwise the future may never resolve, which could cause deadlock.

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

PathPackages
Mmercurial/wireprotov2peer.py (7 lines)

Diff 10857

mercurial/wireprotov2peer.py

raise error.ProgrammingError( raise error.ProgrammingError(
'received frame for unknown request; this is either a bug in ' 'received frame for unknown request; this is either a bug in '
'the clientreactor not screening for this or this instance was ' 'the clientreactor not screening for this or this instance was '
'never told about this request: %r' % frame) 'never told about this request: %r' % frame)
response = self._responses[frame.requestid] response = self._responses[frame.requestid]
if action == 'responsedata': if action == 'responsedata':
# Any failures processing this frame should bubble up to the
# future tracking the request.
try:
self._processresponsedata(frame, meta, response) self._processresponsedata(frame, meta, response)
except BaseException as e:
self._futures[frame.requestid].set_exception(e)
else: else:
raise error.ProgrammingError( raise error.ProgrammingError(
'unhandled action from clientreactor: %s' % action) 'unhandled action from clientreactor: %s' % action)
def _processresponsedata(self, frame, meta, response): def _processresponsedata(self, frame, meta, response):
# This buffers all data until end of stream is received. This # This buffers all data until end of stream is received. This
# is bad for performance. # is bad for performance.
# TODO make response data streamable # TODO make response data streamable