Mercurial > hg
annotate tests/test-clone-pull-corruption.t @ 51681:522b4d729e89
mmap: populate the mapping by default
Without pre-population, accessing all data through a mmap can result in many
pagefault, reducing performance significantly. If the mmap is prepopulated, the
performance can no longer get slower than a full read.
(See benchmark number below)
In some cases were very few data is read, prepopulating can be overkill and
slower than populating on access (through page fault). So that behavior can be
controlled when the caller can pre-determine the best behavior.
(See benchmark number below)
In addition, testing with populating in a secondary thread yield great result
combining the best of each approach. This might be implemented in later
changesets.
In all cases, using mmap has a great effect on memory usage when many processes
run in parallel on the same machine.
### Benchmarks
# What did I run
A couple of month back I ran a large benchmark campaign to assess the impact of
various approach for using mmap with the revlog (and other files), it
highlighted a few benchmarks that capture the impact of the changes well. So to
validate this change I checked the following:
- log command displaying various revisions
(read the changelog index)
- log command displaying the patch of listed revisions
(read the changelog index, the manifest index and a few files indexes)
- unbundling a few revisions
(read and write changelog, manifest and few files indexes, and walk the graph
to update some cache)
- pushing a few revisions
(read and write changelog, manifest and few files indexes, walk the graph to
update some cache, performs various accesses locally and remotely during
discovery)
Benchmarks were run using the default module policy (c+py) and the rust one. No
significant difference were found between the two implementation, so we will
present result using the default policy (unless otherwise specified).
I ran them on a few repositories :
- mercurial: a "public changeset only" copy of mercurial from 2018-08-01 using
zstd compression and sparse-revlog
- pypy: a copy of pypy from 2018-08-01 using zstd compression and sparse-revlog
- netbeans: a copy of netbeans from 2018-08-01 using zstd compression and
sparse-revlog
- mozilla-try: a copy of mozilla-try from 2019-02-18 using zstd compression and
sparse-revlog
- mozilla-try persistent-nodemap: Same as the above but with a persistent
nodemap. Used for the log --patch benchmark only
# Results
For the smaller repositories (mercurial, pypy), the impact of mmap is almost
imperceptible, other cost dominating the operation. The impact of prepopulating
is undiscernible in the benchmark we ran.
For larger repositories the benchmark support explanation given above:
On netbeans, the log can be about 1% faster without repopulation (for a
difference < 100ms) but unbundle becomes a bit slower, even when small.
### data-env-vars.name = netbeans-2018-08-01-zstd-sparse-revlog
# benchmark.name = hg.command.unbundle
# benchmark.variants.issue6528 = disabled
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
# benchmark.variants.source = unbundle
# benchmark.variants.verbosity = quiet
with-populate: 0.240157
no-populate: 0.265087 (+10.38%, +0.02)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.459518
no-populate: 1.481290 (+1.49%, +0.02)
## benchmark.name = hg.command.push
# benchmark.variants.explicit-rev = none
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
with-populate: 0.771919
no-populate: 0.792025 (+2.60%, +0.02)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.459518
no-populate: 1.481290 (+1.49%, +0.02)
For mozilla-try, the "slow down" from pre-populate for small `hg log` is more
visible, but still small in absolute time. (using rust value for the persistent
nodemap value to be relevant).
### data-env-vars.name = mozilla-try-2019-02-18-ds2-pnm
# benchmark.name = hg.command.log
# bin-env-vars.hg.flavor = rust
# benchmark.variants.patch = yes
# benchmark.variants.limit-rev = 1
with-populate: 0.237813
no-populate: 0.229452 (-3.52%, -0.01)
# benchmark.variants.limit-rev = 10
# benchmark.variants.patch = yes
with-populate: 1.213578
no-populate: 1.205189
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.variants.limit-rev = 1000
# benchmark.variants.patch = no
# benchmark.variants.rev = tip
with-populate: 0.198607
no-populate: 0.195038 (-1.80%, -0.00)
However pre-populating provide a significant boost on more complex operations
like unbundle or push:
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.name = hg.command.push
# benchmark.variants.explicit-rev = none
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.reuse-external-delta-parent = yes
# benchmark.variants.revs = any-1-extra-rev
with-populate: 4.798632
no-populate: 4.953295 (+3.22%, +0.15)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 4.903618
no-populate: 5.014963 (+2.27%, +0.11)
## benchmark.name = hg.command.unbundle
# benchmark.variants.revs = any-1-extra-rev
with-populate: 1.423411
no-populate: 1.585365 (+11.38%, +0.16)
# benchmark.variants.revs = any-100-extra-rev
with-populate: 1.537909
no-populate: 1.688489 (+9.79%, +0.15)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 11 Apr 2024 00:02:07 +0200 |
parents | 2f2682f40ea0 |
children |
rev | line source |
---|---|
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
1 Corrupt an hg repo with a pull started during an aborted commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
2 Create two repos, so that one of them can pull from the other one. |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
4 $ hg init source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
5 $ cd source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
6 $ touch foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
7 $ hg add foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
8 $ hg ci -m 'add foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
9 $ hg clone . ../corrupted |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
10 updating to branch default |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
12 $ echo >> foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
13 $ hg ci -m 'change foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
14 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
15 Add a hook to wait 5 seconds and then abort the commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
16 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
17 $ cd ../corrupted |
16962
d2fe9aaedcaf
test-clone-pull-corruption: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
18 $ echo "[hooks]" >> .hg/hgrc |
24838
b2c1ff96c1e1
tests: use double quote to quote arguments in hook for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16962
diff
changeset
|
19 $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
20 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
21 start a commit... |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
23 $ touch bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
24 $ hg add bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
25 $ hg ci -m 'add bar' & |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
26 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
27 ... and start a pull while the commit is still running |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
29 $ sleep 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
30 $ hg pull ../source 2>/dev/null |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
31 pulling from ../source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
32 transaction abort! |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
33 rollback completed |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
34 abort: pretxncommit hook exited with status 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
35 searching for changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
36 adding changesets |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
37 adding manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
38 adding file changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
39 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
24838
diff
changeset
|
40 new changesets 52998019f625 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
41 (run 'hg update' to get a working copy) |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
42 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
43 see what happened |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
45 $ wait |
49825
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents:
39489
diff
changeset
|
46 $ hg verify -q |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
47 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
48 $ cd .. |