tests/test-lock-badness.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 14 Apr 2024 02:33:36 +0200
changeset 51587 8cd317c033b8
parent 51497 9da3fcc5f70f
permissions -rw-r--r--
stream-clone: disable gc for the entry listing section for the v2 format This is similar to the change we did for the v3 format in 6e4c8366c5ce. The benchmark bellow show this gives us a notable gains, especially on larger repositories. ### benchmark.name = hg.perf.stream-locked-section # benchmark.name = hg.perf.stream-locked-section # bin-env-vars.hg.flavor = default # bin-env-vars.hg.py-re2-module = default # benchmark.variants.version = v2 ## data-env-vars.name = pypy-2018-08-01-zstd-sparse-revlog 5e931bf8707c: 0.503820 ~~~~~ 1106d1bf695e: 0.470078 (-6.70%, -0.03) ## data-env-vars.name = pypy-2024-03-22-zstd-sparse-revlog 5e931bf8707c: 0.535756 ~~~~~ 1106d1bf695e: 0.490249 (-8.49%, -0.05) ## data-env-vars.name = heptapod-public-2024-03-25-zstd-sparse-revlog 5e931bf8707c: 1.327041 ~~~~~ 1106d1bf695e: 1.174636 (-11.48%, -0.15) ## data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog 5e931bf8707c: 2.439158 ~~~~~ 1106d1bf695e: 2.220515 (-8.96%, -0.22) ## data-env-vars.name = netbeans-2019-11-07-zstd-sparse-revlog 5e931bf8707c: 2.630794 ~~~~~ 1106d1bf695e: 2.261473 (-14.04%, -0.37) ## data-env-vars.name = mozilla-central-2018-08-01-zstd-sparse-revlog 5e931bf8707c: 5.769002 ~~~~~ 1106d1bf695e: 5.062000 (-12.26%, -0.71) ## data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog 5e931bf8707c: 13.351750 ~~~~~ 1106d1bf695e: 12.346655 (-7.53%, -1.01) ## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog 5e931bf8707c: 10.772939 ~~~~~ 1106d1bf695e: 9.495407 (-11.86%, -1.28) ## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog 5e931bf8707c: 10.864297 ~~~~~ 1106d1bf695e: 9.475597 (-12.78%, -1.39) ## data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog 5e931bf8707c: 17.448335 ~~~~~ 1106d1bf695e: 16.027474 (-8.14%, -1.42)

#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 error, registrar
  > 
  > cmdtable = {}
  > command = registrar.command(cmdtable)
  > 
  > def acquiretestlock(repo, releaseexc):
  >     def unlock():
  >         if releaseexc:
  >             raise error.Abort(b'expected release exception')
  >     l = repo._lock(repo.vfs, b'testlock', False, unlock, None, b'test lock')
  >     return l
  > 
  > @command(b'testlockexc')
  > def testlockexc(ui, repo):
  >     testlock = acquiretestlock(repo, True)
  >     try:
  >         testlock.release()
  >     finally:
  >         try:
  >             testlock = acquiretestlock(repo, False)
  >         except error.LockHeld:
  >             raise error.Abort(b'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

  $ SYNC_FILE_LOCKED="$TESTTMP/sync-file-locked"
  $ export SYNC_FILE_LOCKED
  $ SYNC_FILE_TRYING_LOCK="$TESTTMP/sync-file-trying-lock"
  $ export SYNC_FILE_TRYING_LOCK
  $ cat << EOF > locker.sh
  > $RUNTESTDIR/testlib/wait-on-file 10 $SYNC_FILE_TRYING_LOCK $SYNC_FILE_LOCKED;
  > EOF
  $ cat << EOF > waiter.sh
  > $RUNTESTDIR/testlib/wait-on-file 10 $SYNC_FILE_LOCKED;
  > EOF
  $ clean_sync() {
  >   rm -f "$SYNC_FILE_LOCKED"
  >   rm -f "$SYNC_FILE_TRYING_LOCK"
  > }


  $ clean_sync
  $ echo b > b/b
  $ hg -R b ci -A -m b \
  >   --config hooks.precommit="sh $TESTTMP/locker.sh" \
  >   > stdout &
  $ hg -R b up -q \
  >   --config ui.timeout.warn=0 \
  >   --config hooks.pre-update="sh $TESTTMP/waiter.sh" \
  >   --config devel.lock-wait-sync-file="$SYNC_FILE_TRYING_LOCK" \
  >   > preup-stdout 2> preup-stderr
  $ wait
  $ cat preup-stdout
  $ cat preup-stderr
  waiting for lock on working directory of b held by process '*' on host '*' (glob)
  got lock after * seconds (glob)
  $ cat stdout
  adding b

On processs waiting on another, warning after a long time.

  $ clean_sync
  $ echo b > b/c
  $ hg -R b ci -A -m b \
  >   --config hooks.precommit="sh $TESTTMP/locker.sh" \
  >   > stdout &
  $ hg -R b up -q \
  >   --config hooks.pre-update="sh $TESTTMP/waiter.sh" \
  >   --config devel.lock-wait-sync-file="$SYNC_FILE_TRYING_LOCK" \
  >   --config ui.timeout.warn=250 \
  >   > preup-stdout 2> preup-stderr
  $ wait
  $ cat preup-stdout
  $ cat preup-stderr
  $ cat stdout
  adding c

On processs waiting on another, warning disabled.

  $ clean_sync
  $ echo b > b/d
  $ hg -R b ci -A -m b \
  >   --config hooks.precommit="sh $TESTTMP/locker.sh" \
  >   > stdout &
  $ hg -R b up -q \
  >   --config hooks.pre-update="sh $TESTTMP/waiter.sh" \
  >   --config devel.lock-wait-sync-file="$SYNC_FILE_TRYING_LOCK" \
  >   --config ui.timeout.warn=-1 \
  >   > preup-stdout 2>preup-stderr
  $ wait
  $ cat preup-stdout
  $ cat preup-stderr
  $ cat stdout
  adding d

check we still print debug output

On processs waiting on another, warning after a long time (debug output on)

  $ clean_sync
  $ echo b > b/e
  $ hg -R b ci -A -m b \
  >   --config hooks.precommit="sh $TESTTMP/locker.sh" \
  >   > stdout &
  $ hg -R b up \
  >   --config hooks.pre-update="sh $TESTTMP/waiter.sh" \
  >   --config devel.lock-wait-sync-file="$SYNC_FILE_TRYING_LOCK" \
  >   --config ui.timeout.warn=250 --debug \
  >   > preup-stdout 2>preup-stderr
  $ wait
  $ cat preup-stdout
  running hook pre-update: sh $TESTTMP/waiter.sh
  waiting for lock on working directory of b held by process '*' on host '*' (glob)
  got lock after * seconds (glob)
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat preup-stderr
  $ cat stdout
  adding e

On processs waiting on another, warning disabled, (debug output on)

  $ clean_sync
  $ echo b > b/f
  $ hg -R b ci -A -m b \
  >   --config hooks.precommit="sh $TESTTMP/locker.sh" \
  >   > stdout &
  $ hg -R b up \
  >   --config hooks.pre-update="sh $TESTTMP/waiter.sh" \
  >   --config devel.lock-wait-sync-file="$SYNC_FILE_TRYING_LOCK" \
  >   --config ui.timeout.warn=-1 --debug\
  >   > preup-stdout 2>preup-stderr
  $ wait
  $ cat preup-stdout
  running hook pre-update: sh $TESTTMP/waiter.sh
  waiting for lock on working directory of b held by process '*' on host '*' (glob)
  got lock after * seconds (glob)
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat preup-stderr
  $ cat stdout
  adding f

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: $EACCES$
  [20]

  $ chmod 700 a/.hg/store