Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-22.2: backupccl: tenants should be restored in their correct state #88157

Merged
merged 1 commit into from
Sep 19, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 19, 2022

Backport 1/1 commits from #87931 on behalf of @adityamaru.

/cc @cockroachdb/release


Previously, all backed up tenants were unconditionally moved through an ADD and then ACTIVE state during a cluster/tenant restore. This behaviour appears incorrect. If the tenant was backed up in and adding or dropped state then it should be restored in the same state as well.

This change only moves ACTIVE backed up tenants through an ADD and then ACTIVE state thereby fixing this bug.

Fixes: #87915

Release note (bug fix): Cluster and tenant restores of dropped or adding tenants would incorrectly activate those tenants
during restore.


Release justification: high-impact bug fix that prevents dropped or adding tenants from being activated after restore.

Previously, all backed up tenants were unconditionally moved through
an `ADD` and then `ACTIVE` state during a cluster/tenant restore. This
behaviour appears incorrect. If the tenant was backed up in and adding or
dropped state then it should be restored in the same state as well.

This change only moves `ACTIVE` backed up tenants through an `ADD` and then
`ACTIVE` state thereby fixing this bug.

Fixes: #87915

Release note (bug fix): Cluster and tenant restores of dropped or adding tenants
would incorrectly activate those tenants during restore.
@blathers-crl blathers-crl bot requested a review from a team September 19, 2022 18:19
@blathers-crl blathers-crl bot requested a review from a team as a code owner September 19, 2022 18:19
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-87931 branch from 616baf3 to 8b91e97 Compare September 19, 2022 18:19
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 19, 2022

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 19, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@adityamaru adityamaru merged commit 72073db into release-22.2 Sep 19, 2022
@adityamaru adityamaru deleted the blathers/backport-release-22.2-87931 branch September 19, 2022 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants