Mercurial > public > mercurial-scm > hg-stable
diff mercurial/util.py @ 36724:d77c3b023393
lock: block signal interrupt while making a lock file
On Windows where symlink isn't supported, util.makelock() could leave an empty
file if interrupted immediately after os.open(). This empty lock never dies
as it has no process id recorded.
ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
# an interrupt may occur here
os.write(ld, info)
os.close(ld)
This was a long-standing bug of TortoiseHg which runs a command-server and
kills it by CTRL_C_EVENT, reported by random Windows users.
https://bitbucket.org/tortoisehg/thg/issues/4873/#comment-43591129
At first, I tried to fix makelock() to clean up a stale lock file, which
turned out to be hard because any instructions may be interrupted by a
signal.
ld = None
try:
# CALL_FUNCTION # os.open(...)
# an interrupt may occur here
# STORE_FAST # ld = ...
ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
os.write(ld, info)
...
return True
except:
if ld:
...
os.unlink(pathname)
return False
So I decided to block signals by temporarily replacing the signal handlers
so makelcok() and held = 1 will never be interrupted.
Many thanks to Fernando Najera for investigating the issue.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 03 Mar 2018 23:49:39 -0500 |
parents | aa9c5d447980 |
children | ca201470abb4 |
line wrap: on
line diff
--- a/mercurial/util.py Sun Mar 04 09:40:12 2018 -0500 +++ b/mercurial/util.py Sat Mar 03 23:49:39 2018 -0500 @@ -1676,6 +1676,11 @@ timer = time.perf_counter def makelock(info, pathname): + """Create a lock file atomically if possible + + This may leave a stale lock file if symlink isn't supported and signal + interrupt is enabled. + """ try: return os.symlink(info, pathname) except OSError as why: