This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9680

sharesafe: add functionality to automatically downgrade shares
ClosedPublic

Authored by pulkit on Jan 6 2021, 8:21 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGeec47efe219d: sharesafe: add functionality to automatically downgrade shares
Summary

Reasoning is same as previous patch which adds automatic upgrade support.

Downgrade is required as if automatic upgrade is enabled, all shares upgrade and
then source repository downgrades, shares won't work. We need to downgrade them.

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

pulkit created this revision.Jan 6 2021, 8:21 AM
baymax updated this revision to Diff 24621.Jan 6 2021, 10:14 AM

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

marmoute requested changes to this revision.Jan 6 2021, 5:14 PM
marmoute added a subscriber: marmoute.

same feedback as D9679 ☺

This revision now requires changes to proceed.Jan 6 2021, 5:14 PM
pulkit updated this revision to Diff 24625.Jan 7 2021, 6:47 AM
baymax updated this revision to Diff 24631.Jan 8 2021, 7:56 AM

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

pulkit updated this revision to Diff 24644.Jan 8 2021, 11:24 AM
marmoute added a comment.Jan 8 2021, 6:11 PM

(I assume the same feedback apply there)

pulkit added a comment.Jan 9 2021, 6:27 AM
In D9680#146569, @marmoute wrote:

(I assume the same feedback apply there)

Yes, incorporated those already.

baymax updated this revision to Diff 24694.Jan 9 2021, 8:03 AM

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

Alphare accepted this revision.Jan 12 2021, 11:28 AM
pulkit updated this revision to Diff 24776.Jan 13 2021, 6:30 AM
pulkit added a commit: rHGeec47efe219d: sharesafe: add functionality to automatically downgrade shares.Jan 13 2021, 2:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGeec47efe219d: sharesafe: add functionality to automatically downgrade shares (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24795

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'server.stream-narrow-clones', b'server.stream-narrow-clones',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'sharesafe-auto-downgrade-shares',
default=False,
)
coreconfigitem(
b'experimental',
b'sharesafe-auto-upgrade-shares', b'sharesafe-auto-upgrade-shares',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch', b'single-head-per-branch',
default=False, default=False,
) )

mercurial/localrepo.py

# to be reshared # to be reshared
if requirementsmod.SHARESAFE_REQUIREMENT in requirements: if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
if ( if (
shared shared
and requirementsmod.SHARESAFE_REQUIREMENT and requirementsmod.SHARESAFE_REQUIREMENT
not in _readrequires(sharedvfs, True) not in _readrequires(sharedvfs, True)
): ):
if ui.configbool(
b'experimental', b'sharesafe-auto-downgrade-shares'
):
# prevent cyclic import localrepo -> upgrade -> localrepo
from . import upgrade
upgrade.downgrade_share_to_non_safe(
ui,
hgvfs,
sharedvfs,
requirements,
)
else:
raise error.Abort( raise error.Abort(
_(b"share source does not support exp-sharesafe requirement") _(
b"share source does not support exp-sharesafe requirement"
) )
)
else:
requirements |= _readrequires(storevfs, False) requirements |= _readrequires(storevfs, False)
elif shared: elif shared:
sourcerequires = _readrequires(sharedvfs, False) sourcerequires = _readrequires(sharedvfs, False)
if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-shares'): if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-shares'):
# prevent cyclic import localrepo -> upgrade -> localrepo # prevent cyclic import localrepo -> upgrade -> localrepo
from . import upgrade from . import upgrade
upgrade.upgrade_share_to_safe( upgrade.upgrade_share_to_safe(

mercurial/upgrade.py

except error.LockError as e: except error.LockError as e:
ui.warn( ui.warn(
_(b'failed to upgrade share, got error: %s\n') _(b'failed to upgrade share, got error: %s\n')
% stringutil.forcebytestr(e.strerror) % stringutil.forcebytestr(e.strerror)
) )
finally: finally:
if wlock: if wlock:
wlock.release() wlock.release()
def downgrade_share_to_non_safe(
ui,
hgvfs,
sharedvfs,
current_requirements,
):
"""Downgrades a share which use share-safe to not use it"""
wlock = None
try:
wlock = lockmod.trylock(ui, hgvfs, b'wlock', 0, 0)
source_requirements = localrepo._readrequires(sharedvfs, True)
# we cannot be 100% sure on which requirements were present in store when
# the source supported share-safe. However, we do know that working
# directory requirements were not there. Hence we remove them
source_requirements -= requirementsmod.WORKING_DIR_REQUIREMENTS
current_requirements |= source_requirements
current_requirements.remove(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, current_requirements)
ui.warn(_(b'repository downgraded to not use share-safe mode\n'))
except error.LockError as e:
# raise error right away because if downgrade failed, we cannot load
# the repository because it does not have complete set of requirements
raise error.Abort(
_(b'failed to downgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror)
)
finally:
if wlock:
wlock.release()

tests/test-share-safe.t

| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg log -GT "{node}: {desc}\n" -R ../ss-share $ hg log -GT "{node}: {desc}\n" -R ../ss-share
abort: share source does not support exp-sharesafe requirement abort: share source does not support exp-sharesafe requirement
[255] [255]
Testing automatic downgrade of shares when config is set
$ touch ../ss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../ss-share --config experimental.sharesafe-auto-downgrade-shares=true
abort: failed to downgrade share, got error: Lock held
[255]
$ rm ../ss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../ss-share --config experimental.sharesafe-auto-downgrade-shares=true
repository downgraded to not use share-safe mode
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg log -GT "{node}: {desc}\n" -R ../ss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
|
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Testing automatic upgrade of shares when config is set Testing automatic upgrade of shares when config is set
$ hg debugupgraderepo -q --run --config format.exp-share-safe=True $ hg debugupgraderepo -q --run --config format.exp-share-safe=True
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store