Mercurial > hg
view tests/test-transaction-safety.t @ 51977:42a116f1cdc1
branchmap-v3: introduce a "stop_rev" argument to `headsrevs`
The `headsrevs` method of the revlog already have a `revs` argument to compute
the headrevs of a limited set of heads. However, it disable the use of the
native compiled code to compute the heads, which slows down the branchmap v3
code a lot.
The branchmap v3 usage is actually quite constrained as we will always only
ignores a part at the top of the graph. So we could be significantly faster.
We start by making small change to the python side to improve the situation and
introduce the new API. More collaboration with the native code are coming later.
This massively speedup operation and close most of the remaining gaps between
branchmap-v3 and branchmap-v2. especially on repository with many revs like
mozilla-try. A small overhead remains mostly because the `headrevs` logic
currently has some inefficiently. We will look into them from there.
### benchmark.name = hg.command.unbundle
# bin-env-vars.hg.py-re2-module = default
# benchmark.variants.issue6528 = disabled
# benchmark.variants.resource-usage = default
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
# benchmark.variants.source = unbundle
# benchmark.variants.validate = default
# benchmark.variants.verbosity = quiet
## data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog
# bin-env-vars.hg.flavor = default
branch-v2: 0.233711 ~~~~~
branch-v3 before: 0.368769 (+57.79%, +0.14)
branch-v3 after: 0.239857 (+2.63%, +0.01)
# bin-env-vars.hg.flavor = rust
branch-v2: 0.235230 ~~~~~
branch-v3 before: 0.372460 (+58.34%, +0.14)
branch-v3 after: 0.240972 (+2.44%, +0.01)
## data-env-vars.name = netbeans-2018-08-01-ds2-pnm
# bin-env-vars.hg.flavor = rust
branch-v2: 0.255586 ~~~~~
branch-v3 before: 0.318907 (+24.78%, +0.06)
branch-v3 after: 0.268560 (+5.08%, +0.01)
## data-env-vars.name = mozilla-central-2024-03-22-zstd-sparse-revlog
# bin-env-vars.hg.flavor = default
branch-v2: 0.339010 ~~~~~
branch-v3 before: 0.349752 (+3.17%, +0.01)
branch-v3 after: 0.349389 (+3.06%, +0.01)
# bin-env-vars.hg.flavor = rust
branch-v2: 0.346525 ~~~~~
branch-v3 before: 0.354300 (+2.24%, +0.01)
branch-v3 after: 0.355661 (+2.64%, +0.01)
## data-env-vars.name = mozilla-central-2024-03-22-ds2-pnm
# bin-env-vars.hg.flavor = rust
branch-v2: 0.380202 ~~~~~
branch-v3 before: 0.396293 (+4.23%, +0.02)
branch-v3 after: 0.408851 (+7.54%, +0.03)
## data-env-vars.name = mozilla-unified-2024-03-22-zstd-sparse-revlog
# bin-env-vars.hg.flavor = default
branch-v2: 0.412165 ~~~~~
branch-v3 before: 0.424769 (+3.06%, +0.01)
branch-v3 after: 0.427782 (+3.79%, +0.02)
# bin-env-vars.hg.flavor = rust
branch-v2: 0.412397 ~~~~~
branch-v3 before: 0.421796 (+2.28%, +0.01)
branch-v3 after: 0.422354 (+2.41%, +0.01)
## data-env-vars.name = mozilla-unified-2024-03-22-ds2-pnm
# bin-env-vars.hg.flavor = rust
branch-v2: 0.429501 ~~~~~
branch-v3 before: 0.443849 (+3.34%, +0.01)
branch-v3 after: 0.443197 (+3.19%, +0.01)
## data-env-vars.name = mozilla-try-2024-03-26-zstd-sparse-revlog
# bin-env-vars.hg.flavor = default
branch-v2: 3.403171 ~~~~~
branch-v3 before: 6.234055 (+83.18%, +2.83)
branch-v3 after: 3.819477 (+12.23%, +0.42)
# bin-env-vars.hg.flavor = rust
branch-v2: 3.454876 ~~~~~
branch-v3 before: 6.307813 (+82.58%, +2.85)
branch-v3 after: 3.590284 (+3.92%, +0.14)
## data-env-vars.name = mozilla-try-2024-03-26-ds2-pnm
# bin-env-vars.hg.flavor = rust
branch-v2: 3.465435 ~~~~~
branch-v3 before: 5.176076 (+49.36%, +1.71)
branch-v3 after: 3.633278 (+4.84%, +0.17)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 03 Sep 2024 11:11:17 +0200 |
parents | 2e0b2a387502 |
children |
line wrap: on
line source
Test transaction safety ======================= #testcases revlogv1 revlogv2 changelogv2 #if revlogv1 $ cat << EOF >> $HGRCPATH > [experimental] > revlogv2=no > EOF #endif #if revlogv2 $ cat << EOF >> $HGRCPATH > [experimental] > revlogv2=enable-unstable-format-and-corrupt-my-data > EOF #endif #if changelogv2 $ cat << EOF >> $HGRCPATH > [format] > exp-use-changelog-v2=enable-unstable-format-and-corrupt-my-data > EOF #endif This test basic case to make sure external process do not see transaction content until it is committed. # TODO: also add an external reader accessing revlog files while they are written # (instead of during transaction finalisation) # TODO: also add stream clone and hardlink clone happening during these transaction. setup ----- synchronisation+output script using the following schedule: [A1] "external" is started [A2] "external" waits on EXT_UNLOCK [A2] "external" + creates EXT_WAITING → unlocks [C1] [B1] "hg commit/pull" is started [B2] "hg commit/pull" is ready to be committed [B3] "hg commit/pull" spawn "internal" using a pretxnclose hook (need [C4]) [C1] "internal" waits on EXT_WAITING (need [A2]) [C2] "internal" creates EXT_UNLOCK → unlocks [A2] [C3] "internal" show the tipmost revision (inside of the transaction) [C4] "internal" waits on EXT_DONE (need [A4]) [A3] "external" show the tipmost revision (outside of the transaction) [A4] "external" creates EXT_DONE → unlocks [C4] [C5] "internal" end of execution -> unlock [B3] [B4] "hg commit/pull" transaction is committed on disk $ mkdir sync $ mkdir output $ mkdir script $ HG_TEST_FILE_EXT_WAITING=$TESTTMP/sync/ext_waiting $ export HG_TEST_FILE_EXT_WAITING $ HG_TEST_FILE_EXT_UNLOCK=$TESTTMP/sync/ext_unlock $ export HG_TEST_FILE_EXT_UNLOCK $ HG_TEST_FILE_EXT_DONE=$TESTTMP/sync/ext_done $ export HG_TEST_FILE_EXT_DONE $ cat << EOF > script/external.sh > #!/bin/sh > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_UNLOCK" "$HG_TEST_FILE_EXT_WAITING" > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > "$TESTTMP/output/external.out" > touch "$HG_TEST_FILE_EXT_DONE" > EOF $ cat << EOF > script/internal.sh > #!/bin/sh > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_WAITING" > touch "$HG_TEST_FILE_EXT_UNLOCK" > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > "$TESTTMP/output/internal.out" > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_DONE" > EOF Automated commands: $ make_one_commit() { > rm -f $TESTTMP/sync/* > rm -f $TESTTMP/output/* > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n' > echo x >> of > sh $TESTTMP/script/external.sh & hg commit -m "$1" > cat $TESTTMP/output/external.out > cat $TESTTMP/output/internal.out > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n' > } $ make_one_pull() { > rm -f $TESTTMP/sync/* > rm -f $TESTTMP/output/* > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n' > echo x >> of > sh $TESTTMP/script/external.sh & hg pull ../other-repo/ --rev "$1" --force --quiet > cat $TESTTMP/output/external.out > cat $TESTTMP/output/internal.out > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n' > } prepare a large source to which to pull from: The source is large to unsure we don't use inline more after the pull $ hg init other-repo $ hg -R other-repo debugbuilddag .+500 --overwritten-file prepare an empty repository where to make test: $ hg init repo $ cd repo $ touch of $ hg add of prepare a small extension to controll inline size $ mkdir $TESTTMP/ext $ cat << EOF > $TESTTMP/ext/small_inline.py > from mercurial import revlog > revlog._maxinline = 3 * 100 > EOF $ cat << EOF >> $HGRCPATH > [extensions] > small_inline=$TESTTMP/ext/small_inline.py > [hooks] > pretxnclose = sh $TESTTMP/script/internal.sh > EOF check this is true for the initial commit (inline → inline) ----------------------------------------------------------- the repository should still be inline (for relevant format) $ make_one_commit first pre-commit: -1 external: -1 internal: 0 first post-tr: 0 first #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif check this is true for extra commit (inline → inline) ----------------------------------------------------- the repository should still be inline (for relevant format) #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif $ make_one_commit second pre-commit: 0 first external: 0 first internal: 1 second post-tr: 1 second #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif check this is true for a small pull (inline → inline) ----------------------------------------------------- the repository should still be inline (for relevant format) #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif $ make_one_pull 3 pre-commit: 1 second warning: repository is unrelated external: 1 second internal: 5 r3 post-tr: 5 r3 #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif Make a large pull (inline → no-inline) --------------------------------------- the repository should no longer be inline (for relevant format) #if revlogv1 $ hg debugrevlog of | grep inline flags : inline, * (glob) #endif $ make_one_pull 400 pre-commit: 5 r3 external: 5 r3 internal: 402 r400 post-tr: 402 r400 #if revlogv1 $ hg debugrevlog of | grep inline [1] #endif check this is true for extra commit (no-inline → no-inline) ----------------------------------------------------------- the repository should no longer be inline (for relevant format) #if revlogv1 $ hg debugrevlog of | grep inline [1] #endif $ make_one_commit third pre-commit: 402 r400 external: 402 r400 internal: 403 third post-tr: 403 third #if revlogv1 $ hg debugrevlog of | grep inline [1] #endif Make a pull (not-inline → no-inline) ------------------------------------- the repository should no longer be inline (for relevant format) #if revlogv1 $ hg debugrevlog of | grep inline [1] #endif $ make_one_pull tip pre-commit: 403 third external: 403 third internal: 503 r500 post-tr: 503 r500 #if revlogv1 $ hg debugrevlog of | grep inline [1] #endif