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.1: release-22.2: only check for introduced spans for online tables in restore #89688

Merged
merged 1 commit into from
Oct 11, 2022

Conversation

msbutler
Copy link
Collaborator

@msbutler msbutler commented Oct 10, 2022

Backport 1/2 commits from #89102.

/cc @cockroachdb/release

This small patch refines the introduced span corruption checker to
ensure that only online tables in a given backup are checked, as oppose to
all tables included in manifest.Descriptors. This is necessary for checking
cluster backups which currently include offline descriptors in
manifest.Descriptors, which should not be checked, as they will not get
restored. If the table was online at some point in the backup's interval,
the check on each DescriptorChange that brought the table online already covers
this case.

Release note (bug fix): refnes a check conducted during restore that ensures
that all previously offline tables were properly introduced.

Release justification: bug fix

@msbutler msbutler requested review from dt and stevendanna October 10, 2022 19:51
@msbutler msbutler self-assigned this Oct 10, 2022
@msbutler msbutler requested a review from a team as a code owner October 10, 2022 19:51
@blathers-crl
Copy link

blathers-crl bot commented Oct 10, 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?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@msbutler msbutler changed the title release-22.1: release-22.2: release-22.1: backupccl: reintroduce previously offline tables with manifest.DescriptorChanges release-22.1: release-22.2: only check for introduced spans for online tables in restore Oct 10, 2022
Copy link
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the code looks good. The commit message could be cleaned up a bit, looks like you may have been going in two different directions with a sentence or two and they ended up a little mangled.

Can we add a test for this case?

This small patch refines the introduced span corruption checker to
ensure that only _online_ tables in a given backup are checked, as oppose to
all tables included in manifest.Descriptors. This is necessary for checking
cluster backups which currently include offline descriptors in
manifest.Descriptors, which should not be checked, as they will not get
restored. If the table was online at some point in the backup's interval,
the check on each DescriptorChange that brought the table online already covers
this case.

Release note (bug fix): refnes a check conducted during restore that ensures
that all previously offline tables were properly introduced.

Release justification: bug fix
@msbutler
Copy link
Collaborator Author

good callout. thanks for the proofread :)

added a little test case as well.

@msbutler msbutler merged commit e438c2f into cockroachdb:release-22.1 Oct 11, 2022
@msbutler msbutler deleted the backport22.1-89102 branch October 11, 2022 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants