Skip to content

Backport of cli: Restore -lock and -lock-timeout init flags into v1.0#29780

Merged
alisdair merged 1 commit intov1.0from
backport/alisdair/init-lock-flags/oddly-healthy-hare
Oct 19, 2021
Merged

Backport of cli: Restore -lock and -lock-timeout init flags into v1.0#29780
alisdair merged 1 commit intov1.0from
backport/alisdair/init-lock-flags/oddly-healthy-hare

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Oct 19, 2021

Backport

This PR is auto-generated from #29773 to be assessed for backporting due to the inclusion of the label 1.0-backport.

The below text is copied from the body of the original PR.


The -lock and -lock-timeout flags were removed in #27464 prior to the release of 1.0 as they were thought to have no effect. This is not true in the case of state migrations when changing backends. This commit restores these flags, and adds test coverage for locking during backend state migration.

Documentation does not need to be updated, as it currently shows that the flags are present. I intend to backport this change to 1.0 because I believe this removal was a bug.

Fixes #29765.

@ghost ghost force-pushed the backport/alisdair/init-lock-flags/oddly-healthy-hare branch from 32824a6 to 24ba744 Compare October 19, 2021 13:45
@ghost ghost requested a review from alisdair October 19, 2021 13:45
@alisdair alisdair merged commit 432bdd5 into v1.0 Oct 19, 2021
@alisdair alisdair deleted the backport/alisdair/init-lock-flags/oddly-healthy-hare branch October 19, 2021 13:51
@github-actions
Copy link
Copy Markdown
Contributor

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant