tests/test-schemes.t
author Gregory Szorc <gregory.szorc@gmail.com>
Tue, 13 Nov 2018 12:32:05 -0800
changeset 40671 e9293c5f8bb9
parent 40035 393e44324037
permissions -rw-r--r--
revlog: automatically read from opened file handles The revlog reading code commonly opens a new file handle for reading on demand. There is support for passing a file handle to revlog.revision(). But it is marked as an internal argument. When revlogs are written, we write() data as it is available. But we don't flush() data until all revisions are written. Putting these two traits together, it is possible for an in-process revlog reader during active writes to trigger the opening of a new file handle on a file with unflushed writes. The reader won't have access to all "available" revlog data (as it hasn't been flushed). And with the introduction of the previous patch, this can lead to the revlog raising an error due to a partial read. I witnessed this behavior when applying changegroup data (via `hg pull`) before issue6006 was fixed via different means. Having this and the previous patch in play would have helped cause errors earlier rather than manifesting as hash verification failures. While this has been a long-standing issue, I believe the relatively new delta computation code has tickled it into being more common. This is because the new delta computation code will compute deltas in more scenarios. This can lead to revlog reading. While the delta computation code is probably supposed to reuse file handles, it appears it isn't doing so in all circumstances. But the issue runs deeper than that. Theoretically, any code can access revision data during revlog writes. It appears we were just getting lucky that it wasn't. (The "add revision callback" passed to addgroup() provides an avenue to do this.) If I changed the revlog's behavior to not cache the full revision text or to clear caches after revision insertion during addgroup(), I was able to produce crashes 100% of the time when writing changelog revisions. This is because changelog's add revision callback attempts to resolve the revision data to access the changed files list. And without the revision's fulltext being cached, we performed a revlog read, which required opening a new file handle. This attempted to read unflushed data, leading to a partial read and a crash. This commit teaches the revlog to store the file handles used for writing multiple revisions during addgroup(). It also teaches the code for resolving a file handle when reading to use these handles, if available. This ensures that *any* reads (regardless of their source) use the active writing file handles, if available. These file handles have access to the unflushed data because they wrote it. This allows reads to complete without issue. Differential Revision: https://phab.mercurial-scm.org/D5267
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18910
diff changeset
     1
#require serve
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
     2
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     3
  $ cat <<EOF >> $HGRCPATH
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     4
  > [extensions]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     5
  > schemes=
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     6
  > 
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     7
  > [schemes]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     8
  > l = http://localhost:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
     9
  > parts = http://{1}:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    10
  > z = file:\$PWD/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    11
  > EOF
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    12
  $ hg init test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    13
  $ cd test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    14
  $ echo a > a
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    15
  $ hg ci -Am initial
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    16
  adding a
18910
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    17
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    18
invalid scheme
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    19
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    20
  $ hg log -R z:z
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    21
  abort: no '://' in scheme url 'z:z'
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    22
  [255]
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    23
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    24
http scheme
b52404a914a9 scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    25
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    26
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    27
  $ cat hg.pid >> $DAEMON_PIDS
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    28
  $ hg incoming l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    29
  comparing with l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    30
  searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    31
  no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    32
  [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
    33
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    34
check that {1} syntax works
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
    35
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    36
  $ hg incoming --debug parts://localhost
12643
d08bb64888bc tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12486
diff changeset
    37
  using http://localhost:$HGPORT/
13603
395a84f78736 httprepo: use caps instead of between for compat check
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12643
diff changeset
    38
  sending capabilities command
13815
d066d8d652c8 url: add trailing slashes to URLs with hostnames that don't have one
Brodie Rao <brodie@bitheap.org>
parents: 13742
diff changeset
    39
  comparing with parts://localhost/
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13815
diff changeset
    40
  query 1; heads
14624
f03c82d1f50a setdiscovery: batch heads and known(ownheads)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14164
diff changeset
    41
  sending batch command
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    42
  searching for changes
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13815
diff changeset
    43
  all remote heads known locally
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    44
  no changes found
40035
393e44324037 httppeer: report http statistics
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27982
diff changeset
    45
  (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob)
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    46
  [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
    47
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    48
check that paths are expanded
10070
9d1195b2f00d schemes: url parts are counted from 1
Alexander Solovyov <piranha@piranha.org.ua>
parents: 9964
diff changeset
    49
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    50
  $ PWD=`pwd` hg incoming z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    51
  comparing with z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    52
  searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    53
  no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    54
  [1]
11154
17031fea4e95 expand paths to local repository or bundle in appropriate classes
Alexander Solovyov <piranha@piranha.org.ua>
parents: 10070
diff changeset
    55
27982
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    56
check that debugexpandscheme outputs the canonical form
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    57
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    58
  $ hg debugexpandscheme bb://user/repo
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    59
  https://bitbucket.org/user/repo
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    60
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    61
expanding an unknown scheme emits the input
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    62
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    63
  $ hg debugexpandscheme foobar://this/that
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    64
  foobar://this/that
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    65
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    66
expanding a canonical URL emits the input
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    67
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    68
  $ hg debugexpandscheme https://bitbucket.org/user/repo
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    69
  https://bitbucket.org/user/repo
bf1d5c223ac0 schemes: add debugexpandscheme command, resolving a scheme to canonical form
Jason R. Coombs <jaraco@jaraco.com>
parents: 22046
diff changeset
    70
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    71
errors
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    72
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
    73
  $ cat errors.log
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
    74
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
    75
  $ cd ..