This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9762

persistent-nodemap: add a "abort" option to the slow-path config
ClosedPublic

Authored by marmoute on Jan 13 2021, 11:05 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG014ac7a32048: persistent-nodemap: add a "abort" option to the slow-path config
rHG8b93e872febd: persistent-nodemap: add a "abort" option to the slow-path config
rHG38d413466299: persistent-nodemap: add a "abort" option to the slow-path config
Summary

We make it the default, and document the behavior in the help for the main
config option.

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

Diff 24973

mercurial/configitems.py

# experimental as long as format.use-persistent-nodemap is. # experimental as long as format.use-persistent-nodemap is.
coreconfigitem( coreconfigitem(
b'storage', b'revlog.nodemap.mode', default=b'compat', experimental=True b'storage', b'revlog.nodemap.mode', default=b'compat', experimental=True
) )
# experimental as long as format.use-persistent-nodemap is. # experimental as long as format.use-persistent-nodemap is.
coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'revlog.persistent-nodemap.slow-path', b'revlog.persistent-nodemap.slow-path',
default=b"warn", default=b"abort",
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'revlog.reuse-external-delta', b'revlog.reuse-external-delta',
default=True, default=True,
) )

mercurial/helptext/config.txt

performance if the rust extensions are available. performance if the rust extensions are available.
The "persistence-nodemap" persist the "node -> rev" on disk removing the The "persistence-nodemap" persist the "node -> rev" on disk removing the
need to dynamically build that mapping for each Mercurial invocation. This need to dynamically build that mapping for each Mercurial invocation. This
significantly reduce the startup cost of various local and server-side significantly reduce the startup cost of various local and server-side
operation for larger repository. operation for larger repository.
The performance improving version of this feature is currently only The performance improving version of this feature is currently only
implemented in Rust, so people using a version of Mercurial compiled implemented in Rust, so people not using a version of Mercurial compiled
without the Rust part might actually suffer some slowdown. with the Rust part might actually suffer some slowdown. For this reason,
Such version will by default refuse to access such repositories. That
behavior can be controlled by configuration. Check
:hg:`help config.storage.revlog.persistent-nodemap.slowpath` for details.
Repository with this on-disk format require Mercurial version 5.4 or above. Repository with this on-disk format require Mercurial version 5.4 or above.
Disabled by default. Disabled by default.
``usestore`` ``usestore``
Enable or disable the "store" repository format which improves Enable or disable the "store" repository format which improves
compatibility with systems that fold case or otherwise mangle compatibility with systems that fold case or otherwise mangle
``revlog.persistent-nodemap.slow-path`` ``revlog.persistent-nodemap.slow-path``
Control the behavior of Merucrial when using a repository with "persistent" Control the behavior of Merucrial when using a repository with "persistent"
nodemap with an installation of Mercurial without a fast implementation for nodemap with an installation of Mercurial without a fast implementation for
the feature: the feature:
``allow``: Silently use the slower implementation to access the repository. ``allow``: Silently use the slower implementation to access the repository.
``warn``: Warn, but use the slower implementation to access the repository. ``warn``: Warn, but use the slower implementation to access the repository.
``abort``: Prevent access to such repositories. (This is the default)
Default to ``warn``
For details on the "persistent-nodemap" feature, see: For details on the "persistent-nodemap" feature, see:
:hg:`help config format.use-persistent-nodemap`. :hg:`help config format.use-persistent-nodemap`.
``revlog.reuse-external-delta-parent`` ``revlog.reuse-external-delta-parent``
Control the order in which delta parents are considered when adding new Control the order in which delta parents are considered when adding new
revisions from an external source. revisions from an external source.
(typically: apply bundle from `hg pull` or `hg push`). (typically: apply bundle from `hg pull` or `hg push`).

mercurial/localrepo.py

options[b'enableellipsis'] = True options[b'enableellipsis'] = True
if ui.configbool(b'experimental', b'rust.index'): if ui.configbool(b'experimental', b'rust.index'):
options[b'rust.index'] = True options[b'rust.index'] = True
if requirementsmod.NODEMAP_REQUIREMENT in requirements: if requirementsmod.NODEMAP_REQUIREMENT in requirements:
slow_path = ui.config( slow_path = ui.config(
b'storage', b'revlog.persistent-nodemap.slow-path' b'storage', b'revlog.persistent-nodemap.slow-path'
) )
if slow_path not in (b'allow', b'warn'): if slow_path not in (b'allow', b'warn', b'abort'):
default = ui.config_default( default = ui.config_default(
b'storage', b'revlog.persistent-nodemap.slow-path' b'storage', b'revlog.persistent-nodemap.slow-path'
) )
msg = _( msg = _(
b'unknown value for config ' b'unknown value for config '
b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
) )
ui.warn(msg % slow_path) ui.warn(msg % slow_path)
if not ui.quiet: if not ui.quiet:
ui.warn(_(b'falling back to default value: %s\n') % default) ui.warn(_(b'falling back to default value: %s\n') % default)
slow_path = default slow_path = default
msg = _( msg = _(
b"accessing `persistent-nodemap` repository without associated " b"accessing `persistent-nodemap` repository without associated "
b"fast implementation." b"fast implementation."
) )
hint = _( hint = _(
b"check `hg help config.format.use-persistent-nodemap` " b"check `hg help config.format.use-persistent-nodemap` "
b"for details" b"for details"
) )
if slow_path == b'warn' and not revlog.HAS_FAST_PERSISTENT_NODEMAP: if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
if slow_path == b'warn':
msg = b"warning: " + msg + b'\n' msg = b"warning: " + msg + b'\n'
ui.warn(msg) ui.warn(msg)
if not ui.quiet: if not ui.quiet:
hint = b'(' + hint + b')\n' hint = b'(' + hint + b')\n'
ui.warn(hint) ui.warn(hint)
if slow_path == b'abort':
raise error.Abort(msg, hint=hint)
options[b'persistent-nodemap'] = True options[b'persistent-nodemap'] = True
if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
options[b'persistent-nodemap.mmap'] = True options[b'persistent-nodemap.mmap'] = True
epnm = ui.config(b'storage', b'revlog.nodemap.mode') epnm = ui.config(b'storage', b'revlog.nodemap.mode')
options[b'persistent-nodemap.mode'] = epnm options[b'persistent-nodemap.mode'] = epnm
if ui.configbool(b'devel', b'persistent-nodemap'): if ui.configbool(b'devel', b'persistent-nodemap'):
options[b'devel-force-nodemap'] = True options[b'devel-force-nodemap'] = True

tests/test-persistent-nodemap.t

$ hg init test-repo --config storage.revlog.persistent-nodemap.slow-path=allow $ hg init test-repo --config storage.revlog.persistent-nodemap.slow-path=allow
$ cd test-repo $ cd test-repo
Check handling of the default slow-path value Check handling of the default slow-path value
#if no-pure no-rust #if no-pure no-rust
$ hg id $ hg id
warning: accessing `persistent-nodemap` repository without associated fast implementation. abort: accessing `persistent-nodemap` repository without associated fast implementation.
(check `hg help config.format.use-persistent-nodemap` for details) (check `hg help config.format.use-persistent-nodemap` for details)
000000000000 tip [255]
Unlock further check (we are here to test the feature) Unlock further check (we are here to test the feature)
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [storage] > [storage]
> # to avoid spamming the test > # to avoid spamming the test
> revlog.persistent-nodemap.slow-path=allow > revlog.persistent-nodemap.slow-path=allow
> EOF > EOF
5001 files updated, 0 files merged, 0 files removed, 0 files unresolved 5001 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo > foo $ echo foo > foo
$ hg add foo $ hg add foo
Check slow-path config value handling Check slow-path config value handling
------------------------------------- -------------------------------------
#if no-pure no-rust
$ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value" $ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value"
unknown value for config "storage.revlog.persistent-nodemap.slow-path": "invalid-value" unknown value for config "storage.revlog.persistent-nodemap.slow-path": "invalid-value"
falling back to default value: warn falling back to default value: abort
warning: accessing `persistent-nodemap` repository without associated fast implementation. (no-pure no-rust !) abort: accessing `persistent-nodemap` repository without associated fast implementation.
(check `hg help config.format.use-persistent-nodemap` for details) (no-pure no-rust !) (check `hg help config.format.use-persistent-nodemap` for details)
6b02b8c7b966+ tip [255]
#if no-pure no-rust
$ hg log -r . --config "storage.revlog.persistent-nodemap.slow-path=warn" $ hg log -r . --config "storage.revlog.persistent-nodemap.slow-path=warn"
warning: accessing `persistent-nodemap` repository without associated fast implementation. warning: accessing `persistent-nodemap` repository without associated fast implementation.
(check `hg help config.format.use-persistent-nodemap` for details) (check `hg help config.format.use-persistent-nodemap` for details)
changeset: 5000:6b02b8c7b966 changeset: 5000:6b02b8c7b966
tag: tip tag: tip
user: debugbuilddag user: debugbuilddag
date: Thu Jan 01 01:23:20 1970 +0000 date: Thu Jan 01 01:23:20 1970 +0000
summary: r5000 summary: r5000
$ hg ci -m 'foo' --config "storage.revlog.nodemap.mode=strict" $ hg ci -m 'foo' --config "storage.revlog.persistent-nodemap.slow-path=abort"
transaction abort! abort: accessing `persistent-nodemap` repository without associated fast implementation.
rollback completed (check `hg help config.format.use-persistent-nodemap` for details)
abort: persistent nodemap in strict mode without efficient method
[255] [255]
#else
$ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value"
unknown value for config "storage.revlog.persistent-nodemap.slow-path": "invalid-value"
falling back to default value: abort
6b02b8c7b966+ tip
#endif #endif
$ hg ci -m 'foo' $ hg ci -m 'foo'
#if no-pure no-rust #if no-pure no-rust
$ hg debugnodemap --metadata $ hg debugnodemap --metadata
uid: ???????????????? (glob) uid: ???????????????? (glob)
tip-rev: 5001 tip-rev: 5001