This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9517

commandserver: handle IOError related to flushing of streams
ClosedPublic

Authored by pulkit on Dec 4 2020, 5:57 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGac9de799d390: commandserver: handle IOError related to flushing of streams
Summary

After dispatch, without chg we have handling of flushing of streams and
exception handling related to it. The exception handling part is important
because there can be exceptions when flushing fout or ferr.

One such case is in test-basic.t which was failing on python3+chg without this
patch as this handling was missing from chg.

Failure can be seen at
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/128399

Honestly I am not sure which one of chgserver.py or commandserver.py the
change should go in.

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

pulkit created this revision.Dec 4 2020, 5:57 AM
pulkit planned changes to this revision.Dec 4 2020, 5:57 AM

Sent too soon.

pulkit updated this revision to Diff 24013.Dec 4 2020, 7:56 AM
mharbison72 accepted this revision.Dec 10 2020, 12:03 AM
This revision is now accepted and ready to land.Dec 10 2020, 12:03 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commandserver.py (13 lines)
Mmercurial/dispatch.py (56 lines)

Diff 24158

mercurial/commandserver.py

self.cin, self.cin,
self.cout, self.cout,
self.cerr, self.cerr,
self.cmsg, self.cmsg,
prereposetups=self._prereposetups, prereposetups=self._prereposetups,
) )
try: try:
ret = self._dispatchcommand(req) & 255 err = None
try:
status = self._dispatchcommand(req)
except error.StdioError as e:
status = -1
err = e
retval = dispatch.closestdio(req.ui, err)
if retval:
status = retval
ret = status & 255
# If shutdown-on-interrupt is off, it's important to write the # If shutdown-on-interrupt is off, it's important to write the
# result code *after* SIGINT handler removed. If the result code # result code *after* SIGINT handler removed. If the result code
# were lost, the client wouldn't be able to continue processing. # were lost, the client wouldn't be able to continue processing.
self.cresult.write(struct.pack(b'>i', int(ret))) self.cresult.write(struct.pack(b'>i', int(ret)))
finally: finally:
# restore old cwd # restore old cwd
if b'--cwd' in args: if b'--cwd' in args:
os.chdir(self.cwd) os.chdir(self.cwd)

mercurial/dispatch.py

exc = sys.exc_info()[1] exc = sys.exc_info()[1]
self.ui.warnnoi18n(b'error in exit handlers:\n') self.ui.warnnoi18n(b'error in exit handlers:\n')
self.ui.traceback(force=True) self.ui.traceback(force=True)
finally: finally:
if exc is not None: if exc is not None:
raise exc raise exc
def run(): def closestdio(ui, err):
"""run the command in sys.argv""" status = None
try:
initstdio()
with tracing.log('parse args into request'):
req = request(pycompat.sysargv[1:])
err = None
try:
status = dispatch(req)
except error.StdioError as e:
err = e
status = -1
# In all cases we try to flush stdio streams. # In all cases we try to flush stdio streams.
if util.safehasattr(req.ui, b'fout'): if util.safehasattr(ui, b'fout'):
assert req.ui is not None # help pytype assert ui is not None # help pytype
assert req.ui.fout is not None # help pytype assert ui.fout is not None # help pytype
try: try:
req.ui.fout.flush() ui.fout.flush()
except IOError as e: except IOError as e:
err = e err = e
status = -1 status = -1
if util.safehasattr(req.ui, b'ferr'): if util.safehasattr(ui, b'ferr'):
assert req.ui is not None # help pytype assert ui is not None # help pytype
assert req.ui.ferr is not None # help pytype assert ui.ferr is not None # help pytype
try: try:
if err is not None and err.errno != errno.EPIPE: if err is not None and err.errno != errno.EPIPE:
req.ui.ferr.write( ui.ferr.write(
b'abort: %s\n' % encoding.strtolocal(err.strerror) b'abort: %s\n' % encoding.strtolocal(err.strerror)
) )
req.ui.ferr.flush() ui.ferr.flush()
# There's not much we can do about an I/O error here. So (possibly) # There's not much we can do about an I/O error here. So (possibly)
# change the status code and move on. # change the status code and move on.
except IOError: except IOError:
status = -1 status = -1
return status
def run():
"""run the command in sys.argv"""
try:
initstdio()
with tracing.log('parse args into request'):
req = request(pycompat.sysargv[1:])
err = None
try:
status = dispatch(req)
except error.StdioError as e:
err = e
status = -1
ret = closestdio(req.ui, err)
if ret:
status = ret
_silencestdio() _silencestdio()
except KeyboardInterrupt: except KeyboardInterrupt:
# Catch early/late KeyboardInterrupt as last ditch. Here nothing will # Catch early/late KeyboardInterrupt as last ditch. Here nothing will
# be printed to console to avoid another IOError/KeyboardInterrupt. # be printed to console to avoid another IOError/KeyboardInterrupt.
status = -1 status = -1
sys.exit(status & 255) sys.exit(status & 255)