Mercurial > hg
view tests/test-remotefilelog-bgprefetch.t @ 42044:bb271ec2fbfb
compression: introduce a `storage.revlog.zstd.level` configuration
This option control the zstd compression level used when compressing revlog
chunk. The usage of zstd for revlog compression has not graduated from
experimental yet, but we intend to fix that soon.
The option name for the compression level is more straight forward to pick, so
this changesets comes first. Having a dedicated option for each compression
engine is useful because they don't support the same range of values.
I ran the same measurement as for the zlib compression level (in the parent
changesets). The variation in repository size is stay mostly in the same (small)
range. The "read/write" performance see smallish variation, but are overall much
better than zlib. Write performance show the same tend of having better write
performance for when reaching high-end compression.
Again, we don't intend to change the default zstd compression level (currently:
3) in this series. However this is worth investigating in the future.
The Performance comparison of zlib vs zstd is quite impressive. The repository
size stay in the same range, but the performance are much better in all
situations.
Comparison summary
==================
We are looking at:
- performance range for zlib
- performance range for zstd
- comparison of default zstd (level-3) to default zlib (level 6)
- comparison of the slowest zstd time to the fastest zlib time
Read performance:
-----------------
| zlib | zstd | cmp | f2s
mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88%
pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63%
netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73%
mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71%
Write performance:
------------------
| zlib | zstd | cmp | f2s
mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86%
pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65%
netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82%
mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80%
Raw data
--------
repo alg lvl .hg/store size 00manifest.d read write
mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304
mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320
mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612
mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025
mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142
mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875
mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489
mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286
mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407
mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460
pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984
pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158
pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918
pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409
pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509
pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219
pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239
pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332
pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827
pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218
netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316
netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400
netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064
netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311
netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087
netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626
netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602
netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652
netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349
netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655
mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721
mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093
mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002
mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751
mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805
mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906
mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202
mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683
mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389
mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Mar 2019 18:35:59 +0100 |
| parents | 00c909de1143 |
| children | 2c74337e6483 |
line wrap: on
line source
#require no-windows $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > EOF $ echo x > x $ echo z > z $ hg commit -qAm x $ echo x2 > x $ echo y > y $ hg commit -qAm y $ echo w > w $ rm z $ hg commit -qAm w $ hg bookmark foo $ cd .. # clone the repo $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 2 files to transfer, 776 bytes of data transferred 776 bytes in * seconds (*/sec) (glob) searching for changes no changes found # Set the prefetchdays config to zero so that all commits are prefetched # no matter what their creation date is. Also set prefetchdelay config # to zero so that there is no delay between prefetches. $ cd shallow $ cat >> .hg/hgrc <<EOF > [remotefilelog] > prefetchdays=0 > prefetchdelay=0 > EOF $ cd .. # prefetch a revision $ cd shallow $ hg prefetch -r 0 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) $ hg cat -r 0 x x # background prefetch on pull when configured $ cat >> .hg/hgrc <<EOF > [remotefilelog] > pullprefetch=bookmark() > backgroundprefetch=True > EOF $ hg strip tip saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob) $ clearcache $ hg pull pulling from ssh://user@dummy/master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files updating bookmark foo new changesets 6b4b6f66ef8c (run 'hg update' to get a working copy) prefetching file contents $ sleep 0.5 $ hg debugwaitonprefetch >/dev/null 2>%1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0 $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca $TESTTMP/hgcache/master/af/f024fe4ab0fece4091de044c58c9ae4233383a/bb6ccd5dceaa5e9dc220e0dad65e051b94f69a2c $TESTTMP/hgcache/repos # background prefetch with repack on pull when configured $ cat >> .hg/hgrc <<EOF > [remotefilelog] > backgroundrepack=True > EOF $ hg strip tip saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob) $ clearcache $ hg pull pulling from ssh://user@dummy/master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files updating bookmark foo new changesets 6b4b6f66ef8c (run 'hg update' to get a working copy) prefetching file contents $ sleep 0.5 $ hg debugwaitonprefetch >/dev/null 2>%1 $ sleep 0.5 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 0.5 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histidx $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histpack $TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.dataidx $TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.datapack $TESTTMP/hgcache/master/packs/repacklock $TESTTMP/hgcache/repos # background prefetch with repack on update when wcprevset configured $ clearcache $ hg up -r 0 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0 $TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a $TESTTMP/hgcache/repos $ hg up -r 1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files fetched over 2 fetches - (2 misses, 0.00% hit ratio) over *s (glob) $ cat >> .hg/hgrc <<EOF > [remotefilelog] > bgprefetchrevs=.:: > EOF $ clearcache $ hg up -r 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved * files fetched over * fetches - (* misses, 0.00% hit ratio) over *s (glob) $ sleep 1 $ hg debugwaitonprefetch >/dev/null 2>%1 $ sleep 1 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/repacklock $TESTTMP/hgcache/repos # Ensure that file 'w' was prefetched - it was not part of the update operation and therefore # could only be downloaded by the background prefetch $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: w: Node Delta Base Delta Length Blob Size bb6ccd5dceaa 000000000000 2 2 Total: 2 2 (0.0% bigger) x: Node Delta Base Delta Length Blob Size ef95c5376f34 000000000000 3 3 1406e7411862 ef95c5376f34 14 2 Total: 17 5 (240.0% bigger) y: Node Delta Base Delta Length Blob Size 076f5e2225b3 000000000000 2 2 Total: 2 2 (0.0% bigger) z: Node Delta Base Delta Length Blob Size 69a1b6752270 000000000000 2 2 Total: 2 2 (0.0% bigger) # background prefetch with repack on commit when wcprevset configured $ cat >> .hg/hgrc <<EOF > [remotefilelog] > bgprefetchrevs=0:: > EOF $ clearcache $ find $CACHEDIR -type f | sort $ echo b > b $ hg commit -qAm b * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) $ hg bookmark temporary $ sleep 1 $ hg debugwaitonprefetch >/dev/null 2>%1 $ sleep 1 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/repacklock $TESTTMP/hgcache/repos # Ensure that file 'w' was prefetched - it was not part of the commit operation and therefore # could only be downloaded by the background prefetch $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: w: Node Delta Base Delta Length Blob Size bb6ccd5dceaa 000000000000 2 2 Total: 2 2 (0.0% bigger) x: Node Delta Base Delta Length Blob Size ef95c5376f34 000000000000 3 3 1406e7411862 ef95c5376f34 14 2 Total: 17 5 (240.0% bigger) y: Node Delta Base Delta Length Blob Size 076f5e2225b3 000000000000 2 2 Total: 2 2 (0.0% bigger) z: Node Delta Base Delta Length Blob Size 69a1b6752270 000000000000 2 2 Total: 2 2 (0.0% bigger) # background prefetch with repack on rebase when wcprevset configured $ hg up -r 2 3 files updated, 0 files merged, 3 files removed, 0 files unresolved (leaving bookmark temporary) $ clearcache $ find $CACHEDIR -type f | sort $ hg rebase -s temporary -d foo rebasing 3:58147a5b5242 "b" (temporary tip) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob) 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) $ sleep 1 $ hg debugwaitonprefetch >/dev/null 2>%1 $ sleep 1 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 1 # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore # could only be downloaded by the background prefetch $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: w: Node Delta Base Delta Length Blob Size bb6ccd5dceaa 000000000000 2 2 Total: 2 2 (0.0% bigger) x: Node Delta Base Delta Length Blob Size ef95c5376f34 000000000000 3 3 1406e7411862 ef95c5376f34 14 2 Total: 17 5 (240.0% bigger) y: Node Delta Base Delta Length Blob Size 076f5e2225b3 000000000000 2 2 Total: 2 2 (0.0% bigger) z: Node Delta Base Delta Length Blob Size 69a1b6752270 000000000000 2 2 Total: 2 2 (0.0% bigger) # Check that foregound prefetch with no arguments blocks until background prefetches finish $ hg up -r 3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ clearcache $ hg prefetch --repack waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?) got lock after * seconds (glob) (?) (running background incremental repack) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) $ sleep 0.5 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 0.5 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/repacklock $TESTTMP/hgcache/repos # Ensure that files were prefetched $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: w: Node Delta Base Delta Length Blob Size bb6ccd5dceaa 000000000000 2 2 Total: 2 2 (0.0% bigger) x: Node Delta Base Delta Length Blob Size ef95c5376f34 000000000000 3 3 1406e7411862 ef95c5376f34 14 2 Total: 17 5 (240.0% bigger) y: Node Delta Base Delta Length Blob Size 076f5e2225b3 000000000000 2 2 Total: 2 2 (0.0% bigger) z: Node Delta Base Delta Length Blob Size 69a1b6752270 000000000000 2 2 Total: 2 2 (0.0% bigger) # Check that foreground prefetch fetches revs specified by '. + draft() + bgprefetchrevs + pullprefetch' $ clearcache $ hg prefetch --repack waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?) got lock after * seconds (glob) (?) (running background incremental repack) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) $ sleep 0.5 $ hg debugwaitonrepack >/dev/null 2>%1 $ sleep 0.5 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/repacklock $TESTTMP/hgcache/repos # Ensure that files were prefetched $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: w: Node Delta Base Delta Length Blob Size bb6ccd5dceaa 000000000000 2 2 Total: 2 2 (0.0% bigger) x: Node Delta Base Delta Length Blob Size ef95c5376f34 000000000000 3 3 1406e7411862 ef95c5376f34 14 2 Total: 17 5 (240.0% bigger) y: Node Delta Base Delta Length Blob Size 076f5e2225b3 000000000000 2 2 Total: 2 2 (0.0% bigger) z: Node Delta Base Delta Length Blob Size 69a1b6752270 000000000000 2 2 Total: 2 2 (0.0% bigger) # Test that if data was prefetched and repacked we dont need to prefetch it again # It ensures that Mercurial looks not only in loose files but in packs as well $ hg prefetch --repack (running background incremental repack)