Mercurial: comparison tests/test-transaction-rollback-on-revlog-split.t

equal deleted inserted replaced

-:cf6e1d535602
+:87f0155d68aa
 > import os
 > import signal
 > from mercurial import extensions, util
 >
 > def extsetup(ui):
->     def close(orig, *args, **kwargs):
+>     def rename(orig, src, dest, *args, **kwargs):
->         path = util.normpath(args[0]._atomictempfile__name)
+>         path = util.normpath(dest)
->         if path.endswith(b'/.hg/store/data/file.i'):
+>         if path.endswith(b'data/file.i'):
 >             os.kill(os.getpid(), signal.SIGKILL)
->         return orig(*args, **kwargs)
+>         return orig(src, dest, *args, **kwargs)
->     extensions.wrapfunction(util.atomictempfile, 'close', close)
+>     extensions.wrapfunction(util, 'rename', rename)
 > EOF
 $ cat > $TESTTMP/intercept_after_rename.py << EOF
 > import os
 > import signal
 >         r = orig(*args, **kwargs)
 >         if path.endswith(b'/.hg/store/data/file.i'):
 >             os.kill(os.getpid(), signal.SIGKILL)
 >         return r
 >     extensions.wrapfunction(util.atomictempfile, 'close', close)
+> def extsetup(ui):
+>     def rename(orig, src, dest, *args, **kwargs):
+>         path = util.normpath(dest)
+>         r = orig(src, dest, *args, **kwargs)
+>         if path.endswith(b'data/file.i'):
+>             os.kill(os.getpid(), signal.SIGKILL)
+>         return r
+>     extensions.wrapfunction(util, 'rename', rename)
 > EOF
 $ cat > $TESTTMP/killme.py << EOF
 > import os
 > import signal
 $ printf '%1024d' '1' > file
 $ hg commit -Aqmb
 $ printf '%20d' '1' > file
 $ hg commit -Aqmc
 $ dd if=/dev/zero of=file bs=1k count=128 > /dev/null 2>&1
-$ hg commit -AqmD
+$ hg commit -AqmD --traceback
 Reference size:
 $ f -s file
 file: size=131072
 $ f -s .hg/store/data/file*
 Killed
 [137]
 #endif
-The revlog have been split on disk
+The inline revlog still exist, but a split version exist next to it
 $ f -s .hg/store/data/file*
 .hg/store/data/file.d: size=132139
-.hg/store/data/file.i: size=256
+.hg/store/data/file.i: size=132395
+.hg/store/data/file.i.s: size=256
-$ cat .hg/store/journal | tr -s '\000' ' ' | grep data/file | tail -1
-data/file.i 128
 The first file.i entry should match the "Reference size" above.
 The first file.d entry is the temporary record during the split,
-The second entry after the split happened. The sum of the second file.d
+A "temporary file" entry exist for the split index.
-and the second file.i entry should match the first file.i entry.
 $ cat .hg/store/journal | tr -s '\000' ' ' | grep data/file
 data/file.i 1174
 data/file.d 0
-data/file.d 1046
+$ cat .hg/store/journal.backupfiles | tr -s '\000' ' ' | tr -s '\00' ' '| grep data/file
-data/file.i 128
+data/file.i data/journal.backup.file.i 0
+data/file.i.s 0
+recover is rolling the split back, the fncache is still valid
 $ hg recover
 rolling back interrupted transaction
 (verify step skipped, run `hg verify` to check your repository content)
 $ f -s .hg/store/data/file*
-.hg/store/data/file.d: size=1046
+.hg/store/data/file.i: size=1174
-.hg/store/data/file.i: size=128
 $ hg tip
 changeset:   1:cfa8d6e60429
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 $ hg verify -q
-warning: revlog 'data/file.d' not in fncache!
-1 warnings encountered!
-hint: run "hg debugrebuildfncache" to recover from corrupt fncache
 $ hg debugrebuildfncache --only-data
-adding data/file.d
+fncache already up to date
-1 items added, 0 removed from fncache
 $ hg verify -q
 $ cd ..
 Test a hard crash right before the index is move into place
 ===========================================================
 .hg/store/data/file.i: size=1174
 $ cat > .hg/hgrc <<EOF
 > [extensions]
 > intercept_rename = $TESTTMP/intercept_before_rename.py
-> [hooks]
-> pretxnchangegroup = python:$TESTTMP/killme.py:killme
 > EOF
 #if chg
 $ hg pull ../troffset-computation
 pulling from ../troffset-computation
+searching for changes
+adding changesets
+adding manifests
+adding file changes
 [255]
 #else
 $ hg pull ../troffset-computation
 pulling from ../troffset-computation
+searching for changes
+adding changesets
+adding manifests
+adding file changes
 Killed
 [137]
 #endif
-The data file is created, but the revlog is still inline
+The inline revlog still exist, but a split version exist next to it
 $ f -s .hg/store/data/file*
 .hg/store/data/file.d: size=132139
 .hg/store/data/file.i: size=132395
+.hg/store/data/file.i.s: size=256
 $ cat .hg/store/journal | tr -s '\000' ' ' | grep data/file
 data/file.i 1174
 data/file.d 0
-data/file.d 1046
+recover is rolling the split back, the fncache is still valid
 $ hg recover
 rolling back interrupted transaction
 (verify step skipped, run `hg verify` to check your repository content)
 $ f -s .hg/store/data/file*
-.hg/store/data/file.d: size=1046
 .hg/store/data/file.i: size=1174
 $ hg tip
 changeset:   1:cfa8d6e60429
 tag:         tip
 user:        test
 Test a hard crash right after the index is move into place
 ===========================================================
 Now retry the procedure but intercept the rename of the index.
-Things get corrupted /o\
 $ hg clone --quiet --rev 1 troffset-computation troffset-computation-crash-after-rename
 $ cd troffset-computation-crash-after-rename
 Reference size:
 $ f -s file
 .hg/store/data/file.i: size=1174
 $ cat > .hg/hgrc <<EOF
 > [extensions]
 > intercept_rename = $TESTTMP/intercept_after_rename.py
-> [hooks]
-> pretxnchangegroup = python:$TESTTMP/killme.py:killme
 > EOF
 #if chg
 $ hg pull ../troffset-computation
 pulling from ../troffset-computation
+searching for changes
+adding changesets
+adding manifests
+adding file changes
 [255]
 #else
 $ hg pull ../troffset-computation
 pulling from ../troffset-computation
+searching for changes
+adding changesets
+adding manifests
+adding file changes
 Killed
 [137]
 #endif
-the revlog has been split on disk
+The inline revlog was over written on disk
 $ f -s .hg/store/data/file*
 .hg/store/data/file.d: size=132139
 .hg/store/data/file.i: size=256
 $ cat .hg/store/journal | tr -s '\000' ' ' | grep data/file
 data/file.i 1174
 data/file.d 0
-data/file.d 1046
+recover is rolling the split back, the fncache is still valid
 $ hg recover
 rolling back interrupted transaction
-abort: attempted to truncate data/file.i to 1174 bytes, but it was already 256 bytes
+(verify step skipped, run `hg verify` to check your repository content)
+$ f -s .hg/store/data/file*
-[255]
+.hg/store/data/file.i: size=1174
-$ f -s .hg/store/data/file*
-.hg/store/data/file.d: size=1046
-.hg/store/data/file.i: size=256
 $ hg tip
 changeset:   1:cfa8d6e60429
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 $ hg verify -q
-abandoned transaction found - run hg recover
-warning: revlog 'data/file.d' not in fncache!
-file@0: data length off by -131093 bytes
-file@2: unpacking fa1120531cc1: partial read of revlog data/file.d; expected 21 bytes from offset 1046, got 0
-file@3: unpacking a631378adaa3: partial read of revlog data/file.d; expected 131072 bytes from offset 1067, got -21
-file@?: rev 2 points to nonexistent changeset 2
-(expected )
-file@?: fa1120531cc1 not in manifests
-file@?: rev 3 points to nonexistent changeset 3
-(expected )
-file@?: a631378adaa3 not in manifests
-not checking dirstate because of previous errors
-3 warnings encountered!
-hint: run "hg debugrebuildfncache" to recover from corrupt fncache
-7 integrity errors encountered!
-(first damaged changeset appears to be 0)
-[1]
 $ cd ..
 Have the transaction rollback itself without any hard crash
 ===========================================================
 transaction abort!
 rollback completed
 abort: pretxnchangegroup hook exited with status 1
 [40]
-File are still split on disk, with the expected size.
+The split was rollback
 $ f -s .hg/store/data/file*
-.hg/store/data/file.d: size=1046
+.hg/store/data/file.d: size=0
-.hg/store/data/file.i: size=128
+.hg/store/data/file.i: size=1174
 $ hg tip
 changeset:   1:cfa8d6e60429
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 $ hg verify -q
-warning: revlog 'data/file.d' not in fncache!
-1 warnings encountered!
-hint: run "hg debugrebuildfncache" to recover from corrupt fncache
 $ cd ..
 Read race
 =========

branch	stable
changeset 50316	87f0155d68aa
parent 50314	6487737e0f00
child 50334	2231f7d8a602