( )⚙ D11749 test: add test for a former race resulting in bad dirstate

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11749

test: add test for a former race resulting in bad dirstate
ClosedPublic

Authored by valentin.gatienbaron on Nov 10 2021, 8:24 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbc6547f61310: test: add test for a former race resulting in bad dirstate
Summary

In 6.0 this used to result in the size being stored in the dirstate is wrong.
This was fixed by other change to the mtime gathering logic.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute added a subscriber: marmoute.Nov 11 2021, 4:17 AM

We have a series that we plan to send once the 6.1 cycle start to address this kind of race (in short, the current metadata gathering is flawed).
I'll integrate this test update within that series.

marmoute added a comment.Dec 3 2021, 12:16 PM

I am about to send an updated version of this rebased on the current trunk. I can confirm the test now pass on current trunk.

marmoute updated this revision to Diff 31304.Dec 3 2021, 12:19 PM
marmoute updated this revision to Diff 31313.Dec 4 2021, 7:52 AM
Alphare added a subscriber: Alphare.Dec 6 2021, 4:50 AM

Seems like the test comments need adjusting now?

marmoute retitled this revision from test: add test of a race resulting in bad dirstate to test: add test for a former race resulting in bad dirstate.Dec 10 2021, 4:49 PM
marmoute edited the summary of this revision. (Show Details)
marmoute updated this revision to Diff 31428.
Alphare accepted this revision.Dec 13 2021, 9:07 AM

Thanks

This revision is now accepted and ready to land.Dec 13 2021, 9:07 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-dirstate-race2.t (46 lines)

Diff 31313

tests/test-dirstate-race2.t

# It is not used to synchronise parallele operation so it is "fine" to use it. # It is not used to synchronise parallele operation so it is "fine" to use it.
$ sleep 1 $ sleep 1
$ hg status $ hg status
$ hg debugdirstate --no-dates $ hg debugdirstate --no-dates
n 644 3 (set |unset) a (re) n 644 3 (set |unset) a (re)
$ cat >> $TESTTMP/dirstaterace.py << EOF $ cat >> $TESTTMP/dirstaterace.py << EOF
> import time
> from mercurial import ( > from mercurial import (
> commit,
> extensions, > extensions,
> merge, > merge,
> ) > )
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(merge, 'applyupdates', wrap) > extensions.wrapfunction(merge, 'applyupdates', wrap(0))
> def wrap(orig, *args, **kwargs): > extensions.wrapfunction(commit, 'commitctx', wrap(1))
> def wrap(duration):
> def new(orig, *args, **kwargs):
> res = orig(*args, **kwargs) > res = orig(*args, **kwargs)
> with open("a", "w"): > with open("a", "w"):
> pass # just truncate the file > pass # just truncate the file
> time.sleep(duration)
> return res > return res
> return new
> EOF > EOF
Do an update where file 'a' is changed between hg writing it to disk Do an update where file 'a' is changed between hg writing it to disk
and hg writing the dirstate. The dirstate is correct nonetheless, and and hg writing the dirstate. The dirstate is correct nonetheless, and
so hg status correctly shows a as clean. so hg status correctly shows a as clean.
$ hg up -r 0 --config extensions.race=$TESTTMP/dirstaterace.py $ hg up -r 0 --config extensions.race=$TESTTMP/dirstaterace.py
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg debugdirstate --no-dates $ hg debugdirstate --no-dates
n 644 2 (set |unset) a (re) n 644 2 (set |unset) a (re)
$ echo a > a; hg status; hg diff $ echo a > a; hg status; hg diff
Do a commit where file 'a' is changed between hg committing its new
revision into the repository, and the writing of the dirstate. This
results in a corrupted dirstate (size doesn't match committed size).
$ echo aaa > a; hg commit -qm _
$ hg merge -qr 1; hg resolve -m; rm a.orig
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
(no more unresolved files)
$ cat a
<<<<<<< working copy: be46f74ce38d - test: _
aaa
=======
aa
>>>>>>> merge rev: eb3fc6c17aa3 - test: _
$ hg debugdirstate --no-dates
m 0 -2 (set |unset) a (re)
$ hg commit -m _ --config extensions.race=$TESTTMP/dirstaterace.py
$ hg debugdirstate --no-dates
n 0 -1 unset a
$ cat a | wc -c
*0 (re)
$ hg cat -r . a | wc -c
*105 (re)
$ hg status; hg diff --stat
M a
a | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)