This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8657

procutil: make recent fix for zombies compatible with py2
ClosedPublic

Authored by martinvonz on Jun 25 2020, 3:13 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG95c672c07116: procutil: make recent fix for zombies compatible with py2
Summary

The fix in ed684a82e29b (procutil: always waiting on child processes
to prevent zombies with 'hg serve', 2020-05-07) works only on Python 3
because it passes a daemon argument to threading.Thread(). Python
2 requires you to assign to the .daemon property instead. Python 3
also seems to support that, so this patch fixes the code by
unconditionally using the old form.

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

martinvonz created this revision.Jun 25 2020, 3:13 AM
martinvonz added a comment.Jun 25 2020, 10:51 AM

Reminder that this is intended for stable (since that's where the py3-only fix is)

pulkit accepted this revision.Jun 25 2020, 10:52 AM
This revision is now accepted and ready to land.Jun 25 2020, 10:52 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/procutil.py (4 lines)

Diff 21713

mercurial/utils/procutil.py

# Even though we're not waiting on the child process, # Even though we're not waiting on the child process,
# we still must call waitpid() on it at some point so # we still must call waitpid() on it at some point so
# it's not a zombie/defunct. This is especially relevant for # it's not a zombie/defunct. This is especially relevant for
# chg since the parent process won't die anytime soon. # chg since the parent process won't die anytime soon.
# We use a thread to make the overhead tiny. # We use a thread to make the overhead tiny.
def _do_wait(): def _do_wait():
os.waitpid(pid, 0) os.waitpid(pid, 0)
threading.Thread(target=_do_wait, daemon=True).start() t = threading.Thread(target=_do_wait)
t.daemon = True
t.start()
return return
# Parent process # Parent process
(_pid, status) = os.waitpid(pid, 0) (_pid, status) = os.waitpid(pid, 0)
if os.WIFEXITED(status): if os.WIFEXITED(status):
returncode = os.WEXITSTATUS(status) returncode = os.WEXITSTATUS(status)
else: else:
returncode = -(os.WTERMSIG(status)) returncode = -(os.WTERMSIG(status))
if returncode != 0: if returncode != 0: