phases: rework the logic of _pushdiscoveryphase to bound complexity This rework the various graph traversal in _pushdiscoveryphase to keep the complexity in check. This is done though a couple of things: - first, limiting the space we have to explore, for example, if we are not in publishing push, we don't need to consider remote draft roots that are also draft locally, as there is nothing to be moved there. - avoid unbounded descendant computation, and use the faster "rev between" computation. This provide a massive boost to performance when exchanging with repository with a massive amount of draft, like mozilla-try: ### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog # benchmark.name = hg.command.push # bin-env-vars.hg.flavor = default # bin-env-vars.hg.py-re2-module = default # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.reuse-external-delta-parent = default ## benchmark.variants.revs = any-1-extra-rev before: 20.346590 seconds after: 11.232059 seconds (-38.15%, -7.48 seconds) ## benchmark.variants.revs = any-100-extra-rev before: 24.752051 seconds after: 15.367412 seconds (-37.91%, -9.38 seconds) After this changes, the push operation is still quite too slow. Some of this can be attributed to general phases slowness (reading all the roots from disk for example) and other know slowness (not using persistent-nodemap, branchmap, tags, etc. We are also working on them, but with this series, phase discovery during push no longer showing up in profile and this is a pretty nice and bit low-hanging fruit out of the way. ### (same case as the above) # benchmark.variants.revs = any-1-extra-rev pre-%ln-change: 44.235070 this-changeset: 11.232059 seconds (-74.61%, -33.00 seconds) # benchmark.variants.revs = any-100-extra-rev pre-%ln-change: 49.234697 this-changeset: 15.367412 seconds (-68.79%, -33.87 seconds) Note that with this change, the `hg push` performance is now much closer to the `hg pull` performance, even it still lagging behind a bit. (and the overall performance are still too slow). ### data-env-vars.name = mozilla-try-2023-03-22-ds2-pnm # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.pulled-delta-reuse-policy = default # bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 6.517450 hg.command.push: 11.219888 ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 10.160991 hg.command.push: 14.251107 ### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog # bin-env-vars.hg.py-re2-module = default # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.pulled-delta-reuse-policy = default ## bin-env-vars.hg.flavor = default ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 8.577772 hg.command.push: 11.232059 ## bin-env-vars.hg.flavor = default ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 13.152976 hg.command.push: 15.367412 ## bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 8.731982 hg.command.push: 11.178751 ## bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 13.184236 hg.command.push: 15.620843

     1

#require no-windows

     2

     3

  $ . "$TESTDIR/remotefilelog-library.sh"

     4

     5

  $ hg init master

     6

  $ cd master

     7

  $ cat >> .hg/hgrc <<EOF

     8

  > [remotefilelog]

     9

  > server=True

    10

  > EOF

    11

  $ echo x > x

    12

  $ echo y > y

    13

  $ echo z > z

    14

  $ hg commit -qAm xy

    15

    16

  $ cd ..

    17

    18

  $ hgcloneshallow ssh://user@dummy/master shallow -q

    19

  3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)

    20

  $ cd shallow

    21

    22

Verify corrupt cache handling repairs by default

    23

    24

  $ hg up -q null

    25

  $ chmod u+w $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    26

  $ echo x > $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    27

  $ hg up tip

    28

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    30

    31

Verify corrupt cache error message

    32

    33

  $ hg up -q null

    34

  $ cat >> .hg/hgrc <<EOF

    35

  > [remotefilelog]

    36

  > validatecache=off

    37

  > EOF

    38

  $ chmod u+w $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    39

  $ echo x > $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    40

  $ hg up tip 2>&1 | grep -E "^[^ ].*unexpected remotefilelog"

    41

  abort: unexpected remotefilelog header: illegal format

    42

    43

Verify detection and remediation when remotefilelog.validatecachelog is set

    44

    45

  $ cat >> .hg/hgrc <<EOF

    46

  > [remotefilelog]

    47

  > validatecachelog=$PWD/.hg/remotefilelog_cache.log

    48

  > validatecache=strict

    49

  > EOF

    50

  $ chmod u+w $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    51

  $ echo x > $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0

    52

  $ hg up tip

    53

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

    54

  1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

    55

  $ cat .hg/remotefilelog_cache.log

    56

  corrupt $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/1406e74118627694268417491f018a4a883152f0 during contains

    57

    58

Verify handling of corrupt server cache

    59

    60

  $ rm -f ../master/.hg/remotefilelogcache/y/076f5e2225b3ff0400b98c92aa6cdf403ee24cca

    61

  $ touch ../master/.hg/remotefilelogcache/y/076f5e2225b3ff0400b98c92aa6cdf403ee24cca

    62

  $ clearcache

    63

  $ hg prefetch -r .

    64

  3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)

    65

  $ test -s ../master/.hg/remotefilelogcache/y/076f5e2225b3ff0400b98c92aa6cdf403ee24cca

    66

  $ hg debugremotefilelog $CACHEDIR/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca

    67

  size: 2 bytes

    68

  path: $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca 

    69

  key: 076f5e2225b3 

    70

    71

          node =>           p1            p2      linknode     copyfrom

    72

  076f5e2225b3 => 000000000000  000000000000  f3d0bb0d1e48