This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12619

auto-upgrade: skip the operation if the repository cannot be locked
ClosedPublic

Authored by marmoute on Fri, May 6, 4:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG71774d799de7: auto-upgrade: skip the operation if the repository cannot be locked
Summary

This seems like a fine default behavior for now. If some users wants something
more aggressive we can make the behavior configurable in the future.

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.

Event Timeline

marmoute created this revision.Fri, May 6, 4:37 AM
Kwan added a subscriber: Kwan.Wed, May 11, 9:53 AM
Kwan added inline comments.
mercurial/helptext/config.txt
961

s/attemps/attempt/g

baymax updated this revision to Diff 33417.Thu, May 19, 6:36 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Tue, May 24, 9:40 AM
Alphare added a subscriber: Alphare.

Will do a giant typo pass on the whole series, otherwise looks good.

This revision is now accepted and ready to land.Tue, May 24, 9:40 AM
baymax updated this revision to Diff 33432.Tue, May 24, 10:34 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

Diff 33442

mercurial/helptext/config.txt

don't use this unless you are a seasoned administrator of a Mercurial install don't use this unless you are a seasoned administrator of a Mercurial install
base. base.
Automatic upgrade means that any process accessing the repository will Automatic upgrade means that any process accessing the repository will
upgrade the repository format to use `dirstate-v2`. This only triggers if a upgrade the repository format to use `dirstate-v2`. This only triggers if a
change is needed. This also applies to operations that would have been change is needed. This also applies to operations that would have been
read-only (like hg status). read-only (like hg status).
If the repository cannot be locked, the automatic-upgrade operation will be
skipped. The next operation will attempt it again.
KwanUnsubmitted
Not Done

s/attemps/attempt/g

Kwan: s/attemps/attempt/g
This configuration will apply for moves in any direction, either adding the This configuration will apply for moves in any direction, either adding the
`dirstate-v2` format if `format.use-dirstate-v2=yes` or removing the `dirstate-v2` format if `format.use-dirstate-v2=yes` or removing the
`dirstate-v2` requirement if `format.use-dirstate-v2=no`. So we recommend `dirstate-v2` requirement if `format.use-dirstate-v2=no`. So we recommend
setting both this value and `format.use-dirstate-v2` at the same time. setting both this value and `format.use-dirstate-v2` at the same time.
``use-dirstate-tracked-hint`` ``use-dirstate-tracked-hint``
Enable or disable the writing of "tracked key" file alongside the dirstate. Enable or disable the writing of "tracked key" file alongside the dirstate.
(default to disabled) (default to disabled)
don't use this unless you are a seasoned administrator of a Mercurial install don't use this unless you are a seasoned administrator of a Mercurial install
base. base.
Automatic upgrade means that any process accessing the repository will Automatic upgrade means that any process accessing the repository will
upgrade the repository format to use `dirstate-tracked-hint`. This only upgrade the repository format to use `dirstate-tracked-hint`. This only
triggers if a change is needed. This also applies to operations that would triggers if a change is needed. This also applies to operations that would
have been read-only (like hg status). have been read-only (like hg status).
If the repository cannot be locked, the automatic-upgrade operation will be
skipped. The next operation will attempt it again.
This configuration will apply for moves in any direction, either adding the This configuration will apply for moves in any direction, either adding the
`dirstate-tracked-hint` format if `format.use-dirstate-tracked-hint=yes` or `dirstate-tracked-hint` format if `format.use-dirstate-tracked-hint=yes` or
removing the `dirstate-tracked-hint` requirement if removing the `dirstate-tracked-hint` requirement if
`format.use-dirstate-tracked-hint=no`. So we recommend setting both this `format.use-dirstate-tracked-hint=no`. So we recommend setting both this
value and `format.use-dirstate-tracked-hint` at the same time. value and `format.use-dirstate-tracked-hint` at the same time.
``use-persistent-nodemap`` ``use-persistent-nodemap``
don't use this unless you are a seasoned administrator of a Mercurial install don't use this unless you are a seasoned administrator of a Mercurial install
base. base.
Automatic upgrade means that any process accessing the repository will Automatic upgrade means that any process accessing the repository will
upgrade the repository format to use `share-safe`. This only triggers if a upgrade the repository format to use `share-safe`. This only triggers if a
change is needed. This also applies to operation that would have been change is needed. This also applies to operation that would have been
read-only (like hg status). read-only (like hg status).
If the repository cannot be locked, the automatic-upgrade operation will be
skipped. The next operation will attempt it again.
This configuration will apply for moves in any direction, either adding the This configuration will apply for moves in any direction, either adding the
`share-safe` format if `format.use-share-safe=yes` or removing the `share-safe` format if `format.use-share-safe=yes` or removing the
`share-safe` requirement if `format.use-share-safe=no`. So we recommend `share-safe` requirement if `format.use-share-safe=no`. So we recommend
setting both this value and `format.use-share-safe` at the same time. setting both this value and `format.use-share-safe` at the same time.
``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

mercurial/upgrade_utils/auto_upgrade.py

repo: the current repository instance repo: the current repository instance
maker_func: a factory function that can recreate a repository after an upgrade maker_func: a factory function that can recreate a repository after an upgrade
""" """
clear = False clear = False
loop = 0 loop = 0
try:
while not clear: while not clear:
loop += 1 loop += 1
if loop > 100: if loop > 100:
# XXX basic protection against infinite loop, make it better. # XXX basic protection against infinite loop, make it better.
raise error.ProgrammingError("Too many auto upgrade loops") raise error.ProgrammingError("Too many auto upgrade loops")
clear = True clear = True
for get_action in AUTO_UPGRADE_ACTIONS: for get_action in AUTO_UPGRADE_ACTIONS:
action = get_action(repo) action = get_action(repo)
if action is not None: if action is not None:
clear = False clear = False
with repo.wlock(wait=False), repo.lock(wait=False): with repo.wlock(wait=False), repo.lock(wait=False):
action = get_action(repo) action = get_action(repo)
if action is not None: if action is not None:
action() action()
repo = maker_func() repo = maker_func()
except error.LockError:
# if we cannot get the lock, ignore the auto-upgrade attemps and
# proceed. We might want to make this behavior configurable in the
# future.
pass
return repo return repo

tests/test-upgrade-repo.t

Attempting Auto-upgrade on a read-only repository Attempting Auto-upgrade on a read-only repository
------------------------------------------------- -------------------------------------------------
$ chmod -R a-w auto-upgrade $ chmod -R a-w auto-upgrade
$ hg status -R auto-upgrade \ $ hg status -R auto-upgrade \
> --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \ > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
> --config format.use-dirstate-v2=no > --config format.use-dirstate-v2=no
abort: could not lock working directory of auto-upgrade: Permission denied
[20]
$ hg debugformat -R auto-upgrade | grep dirstate-v2 $ hg debugformat -R auto-upgrade | grep dirstate-v2
dirstate-v2: yes dirstate-v2: yes
$ chmod -R u+w auto-upgrade $ chmod -R u+w auto-upgrade
Attempting Auto-upgrade on a locked repository Attempting Auto-upgrade on a locked repository
---------------------------------------------- ----------------------------------------------
$ hg -R auto-upgrade debuglock --set-lock --quiet & $ hg -R auto-upgrade debuglock --set-lock --quiet &
$ echo $! >> $DAEMON_PIDS $ echo $! >> $DAEMON_PIDS
$ $RUNTESTDIR/testlib/wait-on-file 10 auto-upgrade/.hg/store/lock $ $RUNTESTDIR/testlib/wait-on-file 10 auto-upgrade/.hg/store/lock
$ hg status -R auto-upgrade \ $ hg status -R auto-upgrade \
> --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \ > --config format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories=yes \
> --config format.use-dirstate-v2=no > --config format.use-dirstate-v2=no
abort: repository auto-upgrade: timed out waiting for lock held by 'brunhoff/effffffc:1215708'
[20]
$ hg debugformat -R auto-upgrade | grep dirstate-v2 $ hg debugformat -R auto-upgrade | grep dirstate-v2
dirstate-v2: yes dirstate-v2: yes
$ killdaemons.py $ killdaemons.py