mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
146e346b87
Consider a hypothetical bug in the release function that causes it to raise an exception. Also consider the bisect command, which saves its state in a finally clause. Saving the state requires acquiring the wlock. If we don't unlink the lockfile when the exception is thrown, we'll try to acquire the wlock again. We're going to try and acquire a lock again while our old lockfile is on disk. The PID on disk is our own, and of course we're still running, so we won't take over the lock. Hence we'll be stuck waiting for a lock that we left behind ourselves. To avoid this, always unlink the lockfile. This preserves the invariant that self.held > 0 is equivalent to the lockfile existing on disk.
78 lines
2.0 KiB
Perl
78 lines
2.0 KiB
Perl
#require unix-permissions no-root no-windows
|
|
|
|
Prepare
|
|
|
|
$ hg init a
|
|
$ echo a > a/a
|
|
$ hg -R a ci -A -m a
|
|
adding a
|
|
|
|
$ hg clone a b
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Test that raising an exception in the release function doesn't cause the lock to choke
|
|
|
|
$ cat > testlock.py << EOF
|
|
> from mercurial import cmdutil, error, util
|
|
>
|
|
> cmdtable = {}
|
|
> command = cmdutil.command(cmdtable)
|
|
>
|
|
> def acquiretestlock(repo, releaseexc):
|
|
> def unlock():
|
|
> if releaseexc:
|
|
> raise util.Abort('expected release exception')
|
|
> l = repo._lock(repo.vfs, 'testlock', False, unlock, None, 'test lock')
|
|
> return l
|
|
>
|
|
> @command('testlockexc')
|
|
> def testlockexc(ui, repo):
|
|
> testlock = acquiretestlock(repo, True)
|
|
> try:
|
|
> testlock.release()
|
|
> finally:
|
|
> try:
|
|
> testlock = acquiretestlock(repo, False)
|
|
> except error.LockHeld:
|
|
> raise util.Abort('lockfile on disk even after releasing!')
|
|
> testlock.release()
|
|
> EOF
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> testlock=$TESTTMP/testlock.py
|
|
> EOF
|
|
|
|
$ hg -R b testlockexc
|
|
abort: expected release exception
|
|
[255]
|
|
|
|
One process waiting for another
|
|
|
|
$ cat > hooks.py << EOF
|
|
> import time
|
|
> def sleepone(**x): time.sleep(1)
|
|
> def sleephalf(**x): time.sleep(0.5)
|
|
> EOF
|
|
$ echo b > b/b
|
|
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
|
|
$ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
|
|
waiting for lock on working directory of b held by '*:*' (glob)
|
|
got lock after ? seconds (glob)
|
|
warning: ignoring unknown working parent d2ae7f538514!
|
|
$ wait
|
|
$ cat stdout
|
|
adding b
|
|
|
|
Pushing to a local read-only repo that can't be locked
|
|
|
|
$ chmod 100 a/.hg/store
|
|
|
|
$ hg -R b push a
|
|
pushing to a
|
|
searching for changes
|
|
abort: could not lock repository a: Permission denied
|
|
[255]
|
|
|
|
$ chmod 700 a/.hg/store
|