This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11482

changelog: also monitor `00changelog.n` when applicable (issue6554)
ClosedPublic

Authored by marmoute on Sep 21 2021, 5:51 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc094e829e848: changelog: also monitor `00changelog.n` when applicable (issue6554)
Summary

This let the locarepo's file cache detect outdated nodemap docket and reload the
changelog after localrepo.invalidate when applicable.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (27 lines)
Mtests/test-persistent-nodemap.t (12 lines)

Diff 30409

mercurial/localrepo.py

super(storecache, self).__init__(*paths) super(storecache, self).__init__(*paths)
for path in paths: for path in paths:
_cachedfiles.add((path, b'')) _cachedfiles.add((path, b''))
def join(self, obj, fname): def join(self, obj, fname):
return obj.sjoin(fname) return obj.sjoin(fname)
class changelogcache(storecache):
"""filecache for the changelog"""
def __init__(self):
super(changelogcache, self).__init__()
_cachedfiles.add((b'00changelog.i', b''))
_cachedfiles.add((b'00changelog.n', b''))
def tracked_paths(self, obj):
paths = [self.join(obj, b'00changelog.i')]
if obj.store.opener.options.get(b'persistent-nodemap', False):
paths.append(self.join(obj, b'00changelog.n'))
return paths
class mixedrepostorecache(_basefilecache): class mixedrepostorecache(_basefilecache):
"""filecache for a mix files in .hg/store and outside""" """filecache for a mix files in .hg/store and outside"""
def __init__(self, *pathsandlocations): def __init__(self, *pathsandlocations):
# scmutil.filecache only uses the path for passing back into our # scmutil.filecache only uses the path for passing back into our
# join(), so we can safely pass a list of paths and locations # join(), so we can safely pass a list of paths and locations
super(mixedrepostorecache, self).__init__(*pathsandlocations) super(mixedrepostorecache, self).__init__(*pathsandlocations)
_cachedfiles.update(pathsandlocations) _cachedfiles.update(pathsandlocations)
@storecache(b'phaseroots', b'00changelog.i') @storecache(b'phaseroots', b'00changelog.i')
def _phasecache(self): def _phasecache(self):
return phases.phasecache(self, self._phasedefaults) return phases.phasecache(self, self._phasedefaults)
@storecache(b'obsstore') @storecache(b'obsstore')
def obsstore(self): def obsstore(self):
return obsolete.makestore(self.ui, self) return obsolete.makestore(self.ui, self)
@storecache(b'00changelog.i') @changelogcache()
def changelog(self): def changelog(repo):
# load dirstate before changelog to avoid race see issue6303 # load dirstate before changelog to avoid race see issue6303
self.dirstate.prefetch_parents() repo.dirstate.prefetch_parents()
return self.store.changelog( return repo.store.changelog(
txnutil.mayhavepending(self.root), txnutil.mayhavepending(repo.root),
concurrencychecker=revlogchecker.get_checker(self.ui, b'changelog'), concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'),
) )
@storecache(b'00manifest.i') @storecache(b'00manifest.i')
def manifestlog(self): def manifestlog(self):
return self.store.manifestlog(self, self._storenarrowmatch) return self.store.manifestlog(self, self._storenarrowmatch)
@repofilecache(b'dirstate') @repofilecache(b'dirstate')
def dirstate(self): def dirstate(self):

tests/test-persistent-nodemap.t

actual-tip: 5006 actual-tip: 5006
tip-rev: 5005 tip-rev: 5005
data-length: 121088 data-length: 121088
nodemap-race: right side ready to wait for the lock nodemap-race: right side ready to wait for the lock
nodemap-race: right side locked and ready to commit nodemap-race: right side locked and ready to commit
docket-details: docket-details:
uid: 43c37dde uid: 43c37dde
actual-tip: 5006 actual-tip: 5006
tip-rev: 5005 tip-rev: 5006
data-length: 121088 data-length: 121280
right ready to write, waiting for reader right ready to write, waiting for reader
right proceeding with writing its changelog index and nodemap right proceeding with writing its changelog index and nodemap
finalized changelog write finalized changelog write
persisting changelog nodemap persisting changelog nodemap
new data start at 121088 new data start at 121280
persisted changelog nodemap persisted changelog nodemap
docket-details: docket-details:
uid: 43c37dde uid: 43c37dde
actual-tip: 5007 actual-tip: 5007
tip-rev: 5007 tip-rev: 5007
data-length: 121472 data-length: 121536
$ sh "$RUNTESTDIR"/testlib/wait-on-file 10 sync-files/reader-done $ sh "$RUNTESTDIR"/testlib/wait-on-file 10 sync-files/reader-done
$ cat outputs/reader.txt $ cat outputs/reader.txt
reader: reading changelog reader: reading changelog
reader ready to read the changelog, waiting for right reader ready to read the changelog, waiting for right
reader: nodemap docket read reader: nodemap docket read
record-data-length: 121280 record-data-length: 121280
actual-data-length: 121280 actual-data-length: 121280
file-actual-length: 121472 file-actual-length: 121536
reader: changelog read reader: changelog read
docket-details: docket-details:
uid: 43c37dde uid: 43c37dde
actual-tip: 5006 actual-tip: 5006
tip-rev: 5006 tip-rev: 5006
data-length: 121280 data-length: 121280
tip-rev: 5006 tip-rev: 5006
tip-node: 492901161367 tip-node: 492901161367
node-rev: 5006 node-rev: 5006
error while checking revision: 18 (known-bad-output !)
Inconsistency: Revision 5007 found in nodemap is not in revlog indexi (known-bad-output !)
$ hg -R ./race-repo log -G -r 'head()' $ hg -R ./race-repo log -G -r 'head()'
o changeset: 5007:ac4a2abde241 o changeset: 5007:ac4a2abde241
| tag: tip | tag: tip
~ parent: 5001:16395c3cf7e2 ~ parent: 5001:16395c3cf7e2
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: right-side-commit summary: right-side-commit