This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6026

lock: Improve the waiting for lock message which will help newcomers (issue6081)
Needs RevisionPublic

Authored by akshjain.jain74 on Feb 26 2019, 4:30 AM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Feb 26 2019, 9:21 AM

This patch does not changes any code. It only changes some test output. You need to change the error message in the code.

akshjain.jain74 added a comment.Feb 26 2019, 9:23 AM

Ya I am sending that just trying to find out the file

pulkit added inline comments.Feb 28 2019, 4:31 PM
hgext/journal.py
310–314

This is only for locking namejournal.lock and not for working directory lock and store lock. We need to improve message there too.

316

remove which file manually to continue?

I think we should delete the If it still fails, ..... remove the file manually to continue part.

tests/test-lock-badness.t
18

unrelated changes in the test file here and below.

akshjain.jain74 marked 2 inline comments as done.Feb 28 2019, 5:11 PM
akshjain.jain74 updated this revision to Diff 14279.
akshjain.jain74 marked an inline comment as done.Feb 28 2019, 5:14 PM

@pulkit done changes as per your suggestion in lock file too but what did you meant by storelock?

pulkit added a comment.Mar 6 2019, 8:40 AM

I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now.

Something like:

waiting for lock on working directory of b held by process '*' running <cmd-name> on host '*'

tests/test-extdiff.t
155

unrelated changes.

tests/test-lock-badness.t
18

still here are unrealted changes.

62

The output is not correctly aligned.

akshjain.jain74 added a comment.Mar 6 2019, 12:31 PM

okay @pulkit let me work upon your suggestion and

tests/test-lock-badness.t
18

I accept these changes while running test, if i am not changing this then it will cause test failing

akshjain.jain74 added a comment.Mar 6 2019, 2:31 PM
In D6026#88552, @pulkit wrote:

I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now.
Something like:
waiting for lock on working directory of b held by process '*' running <cmd-name> on host '*'

So for which commands we can show this message, like i got message when i run hg commit --amend sometimes

marmoute added a subscriber: marmoute.Jan 23 2020, 12:12 PM

Gentle ping on this. This has been around for a long time, what's the status of it?

baymax requested changes to this revision.Apr 28 2020, 4:18 AM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Apr 28 2020, 4:18 AM

Revision Contents
Changeset List

Diff 14291

hgext/journal.py

"""Create a lock for the journal file""" """Create a lock for the journal file"""
if self._currentlock(self._lockref) is not None: if self._currentlock(self._lockref) is not None:
raise error.Abort(_('journal lock does not support nesting')) raise error.Abort(_('journal lock does not support nesting'))
desc = _('journal of %s') % vfs.base desc = _('journal of %s') % vfs.base
try: try:
l = lock.lock(vfs, 'namejournal.lock', 0, desc=desc) l = lock.lock(vfs, 'namejournal.lock', 0, desc=desc)
except error.LockHeld as inst: except error.LockHeld as inst:
self.ui.warn( self.ui.warn(
_("waiting for lock on %s held by %r\n") % (desc, inst.locker)) _("waiting for lock on %s held by %r\n"
"""Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.\n""") % (desc, inst.locker))
pulkitUnsubmitted
Done

This is only for locking namejournal.lock and not for working directory lock and store lock. We need to improve message there too.

pulkit: This is only for locking namejournal.lock and not for working directory lock and store lock. We…
# default to 600 seconds timeout # default to 600 seconds timeout
l = lock.lock( l = lock.lock(
pulkitUnsubmitted
Done

remove which file manually to continue?

I think we should delete the If it still fails, ..... remove the file manually to continue part.

pulkit: remove which file manually to continue? I think we should delete the `If it still fails, .....
vfs, 'namejournal.lock', vfs, 'namejournal.lock',
self.ui.configint("ui", "timeout"), desc=desc) self.ui.configint("ui", "timeout"), desc=desc)
self.ui.warn(_("got lock after %s seconds\n") % l.delay) self.ui.warn(_("got lock after %s seconds\n") % l.delay)
self._lockref = weakref.ref(l) self._lockref = weakref.ref(l)
return l return l
def record(self, namespace, name, oldhashes, newhashes): def record(self, namespace, name, oldhashes, newhashes):
"""Record a new journal entry """Record a new journal entry

mercurial/lock.py

This function is responsible to issue warnings and or debug messages about This function is responsible to issue warnings and or debug messages about
the held lock while trying to acquires it.""" the held lock while trying to acquires it."""
def printwarning(printer, locker): def printwarning(printer, locker):
"""issue the usual "waiting on lock" message through any channel""" """issue the usual "waiting on lock" message through any channel"""
# show more details for new-style locks # show more details for new-style locks
if ':' in locker: if ':' in locker:
host, pid = locker.split(":", 1) host, pid = locker.split(":", 1)
msg = (_("waiting for lock on %s held by process %r on host %r\n") msg = (_("waiting for lock on %s held by process %r on host %r\n"
"""Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.\n""")
% (pycompat.bytestr(l.desc), pycompat.bytestr(pid), % (pycompat.bytestr(l.desc), pycompat.bytestr(pid),
pycompat.bytestr(host))) pycompat.bytestr(host)))
else: else:
msg = (_("waiting for lock on %s held by %r\n") msg = (_("waiting for lock on %s held by %r\n"
"""Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.\n""")
% (l.desc, pycompat.bytestr(locker))) % (l.desc, pycompat.bytestr(locker)))
printer(msg) printer(msg)
l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs) l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs)
debugidx = 0 if (warntimeout and timeout) else -1 debugidx = 0 if (warntimeout and timeout) else -1
warningidx = 0 warningidx = 0
if not timeout: if not timeout:

tests/test-check-pyflakes.t

$ testrepohg locate 'set:**.py or grep("^#!.*python")' \ $ testrepohg locate 'set:**.py or grep("^#!.*python")' \
> -X hgext/fsmonitor/pywatchman \ > -X hgext/fsmonitor/pywatchman \
> -X mercurial/pycompat.py -X contrib/python-zstandard \ > -X mercurial/pycompat.py -X contrib/python-zstandard \
> -X mercurial/thirdparty/cbor \ > -X mercurial/thirdparty/cbor \
> -X mercurial/thirdparty/concurrent \ > -X mercurial/thirdparty/concurrent \
> -X mercurial/thirdparty/zope \ > -X mercurial/thirdparty/zope \
> 2>/dev/null \ > 2>/dev/null \
> | xargs pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py" > | xargs pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
contrib/bdiff-torture.py:55: local variable 'inst' is assigned to but never used
contrib/bdiff-torture.py:57: undefined name 'inst'
contrib/bdiff-torture.py:67: undefined name 'xrange'
contrib/perf.py:98: undefined name 'xrange'
contrib/synthrepo.py:368: undefined name 'xrange'
contrib/synthrepo.py:401: undefined name 'xrange'
contrib/synthrepo.py:435: undefined name 'xrange'
contrib/synthrepo.py:436: undefined name 'xrange'
contrib/synthrepo.py:444: undefined name 'xrange'
contrib/synthrepo.py:448: undefined name 'xrange'
contrib/synthrepo.py:452: undefined name 'xrange'
contrib/synthrepo.py:453: undefined name 'xrange'
contrib/synthrepo.py:460: undefined name 'xrange'
contrib/synthrepo.py:469: undefined name 'xrange'
doc/hgmanpage.py:266: undefined name 'xrange'
mercurial/hgweb/server.py:373: undefined name 'reload'
mercurial/lsprof.py:125: undefined name 'execfile'
mercurial/templatefilters.py:319: undefined name 'unicode'
mercurial/util.py:2607: undefined name 'file'
tests/artifacts/scripts/generate-churning-bundle.py:63: undefined name 'xrange'
tests/artifacts/scripts/generate-churning-bundle.py:111: undefined name 'xrange'

tests/test-clone.t

searching for changes searching for changes
no changes found no changes found
adding remote bookmark bookA adding remote bookmark bookA
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock $ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock
(sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
searching for changes searching for changes
no changes found no changes found
adding remote bookmark bookA adding remote bookmark bookA
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
SEC: check for unsafe ssh url SEC: check for unsafe ssh url

tests/test-extdiff.t

diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !) diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
[1] [1]
Test --per-file option for gui tool: Test --per-file option for gui tool:
$ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug $ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug
diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob)
diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
pulkitUnsubmitted
Not Done

unrelated changes.

pulkit: unrelated changes.
making snapshot of 2 files from rev 46c0e4daeb72 making snapshot of 2 files from rev 46c0e4daeb72
a a
b b
making snapshot of 2 files from rev 81906f2b98ac making snapshot of 2 files from rev 81906f2b98ac
a a
b b
running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)
running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)

tests/test-lock-badness.t

$ hg clone a b $ hg clone a b
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 Test that raising an exception in the release function doesn't cause the lock to choke
$ cat > testlock.py << EOF $ cat > testlock.py << EOF
> from mercurial import error, registrar > from mercurial import error, registrar
>
pulkitUnsubmitted
Done

unrelated changes in the test file here and below.

pulkit: unrelated changes in the test file here and below.
pulkitUnsubmitted
Not Done

still here are unrealted changes.

pulkit: still here are unrealted changes.
akshjain.jain74AuthorUnsubmitted
Not Done

I accept these changes while running test, if i am not changing this then it will cause test failing

akshjain.jain74: I accept these changes while running test, if i am not changing this then it will cause test…
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
>
> def acquiretestlock(repo, releaseexc): > def acquiretestlock(repo, releaseexc):
> def unlock(): > def unlock():
> if releaseexc: > if releaseexc:
> raise error.Abort(b'expected release exception') > raise error.Abort(b'expected release exception')
> l = repo._lock(repo.vfs, b'testlock', False, unlock, None, b'test lock') > l = repo._lock(repo.vfs, b'testlock', False, unlock, None, b'test lock')
> return l > return l
>
> @command(b'testlockexc') > @command(b'testlockexc')
> def testlockexc(ui, repo): > def testlockexc(ui, repo):
> testlock = acquiretestlock(repo, True) > testlock = acquiretestlock(repo, True)
> try: > try:
> testlock.release() > testlock.release()
> finally: > finally:
> try: > try:
> testlock = acquiretestlock(repo, False) > testlock = acquiretestlock(repo, False)
$ echo b > b/b $ echo b > b/b
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & $ 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" \ $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
> > preup-stdout 2>preup-stderr > > preup-stdout 2>preup-stderr
$ wait $ wait
$ cat preup-stdout $ cat preup-stdout
$ cat preup-stderr $ cat preup-stderr
waiting for lock on working directory of b held by process '*' on host '*' (glob) waiting for lock on working directory of b held by process '*' on host '*' (glob)
Another Mercurial process seems to be running in
pulkitUnsubmitted
Not Done

The output is not correctly aligned.

pulkit: The output is not correctly aligned.
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
got lock after * seconds (glob) got lock after * seconds (glob)
$ cat stdout $ cat stdout
adding b adding b
On processs waiting on another, warning after a long time. On processs waiting on another, warning after a long time.
$ echo b > b/c $ echo b > b/c
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
$ hg -R b up --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \ $ hg -R b up --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
> --config ui.timeout.warn=250 --debug\ > --config ui.timeout.warn=250 --debug\
> > preup-stdout 2>preup-stderr > > preup-stdout 2>preup-stderr
$ wait $ wait
$ cat preup-stdout $ cat preup-stdout
calling hook pre-update: hghook_pre-update.sleephalf calling hook pre-update: hghook_pre-update.sleephalf
waiting for lock on working directory of b held by process '*' on host '*' (glob) waiting for lock on working directory of b held by process '*' on host '*' (glob)
Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
got lock after * seconds (glob) got lock after * seconds (glob)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat preup-stderr $ cat preup-stderr
$ cat stdout $ cat stdout
adding e adding e
On processs waiting on another, warning disabled, (debug output on) On processs waiting on another, warning disabled, (debug output on)
$ echo b > b/f $ echo b > b/f
$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout & $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
$ hg -R b up --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \ $ hg -R b up --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
> --config ui.timeout.warn=-1 --debug\ > --config ui.timeout.warn=-1 --debug\
> > preup-stdout 2>preup-stderr > > preup-stdout 2>preup-stderr
$ wait $ wait
$ cat preup-stdout $ cat preup-stdout
calling hook pre-update: hghook_pre-update.sleephalf calling hook pre-update: hghook_pre-update.sleephalf
waiting for lock on working directory of b held by process '*' on host '*' (glob) waiting for lock on working directory of b held by process '*' on host '*' (glob)
Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
got lock after * seconds (glob) got lock after * seconds (glob)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat preup-stderr $ cat preup-stderr
$ cat stdout $ cat stdout
adding f adding f
Pushing to a local read-only repo that can't be locked Pushing to a local read-only repo that can't be locked

tests/test-phases-exchange.t

3. Test that push is prevented if lock was already acquired (not a permission 3. Test that push is prevented if lock was already acquired (not a permission
error, but EEXIST) error, but EEXIST)
$ touch .hg/store/lock $ touch .hg/store/lock
$ hg push ../Phi --config ui.timeout=1 $ hg push ../Phi --config ui.timeout=1
pushing to ../Phi pushing to ../Phi
waiting for lock on repository $TESTTMP/Upsilon held by '' waiting for lock on repository $TESTTMP/Upsilon held by ''
Another Mercurial process seems to be running in
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by ''
(lock might be very busy) (lock might be very busy)
[255] [255]
$ rm .hg/store/lock $ rm .hg/store/lock
$ cd .. $ cd ..
#endif #endif

tests/test-remotefilelog-bgprefetch.t

# Check that foregound prefetch with no arguments blocks until background prefetches finish # Check that foregound prefetch with no arguments blocks until background prefetches finish
$ hg up -r 3 $ hg up -r 3
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ clearcache $ clearcache
$ hg prefetch --repack $ hg prefetch --repack
waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?) waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?)
got lock after * seconds (glob) (?) got lock after * seconds (glob) (?)
(running background incremental repack) Another Mercurial process seems to be running in
* files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?)
this repository, e.g. an editor opened by 'hg commit'.
Please make sure all processes are terminated then
try again.
got lock after 1 seconds
(running background incremental repack)
$ sleep 0.5 $ sleep 0.5
$ hg debugwaitonrepack >/dev/null 2>%1 $ hg debugwaitonrepack >/dev/null 2>%1
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx