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: support locality-aware incremental backups in SHOW BACKUP #103830

Merged

Conversation

stevendanna
Copy link
Collaborator

@stevendanna stevendanna commented May 24, 2023

Backport 1/1 commits from #103096.

/cc @cockroachdb/release


Previously, SHOW BACKUP would only resolve incremental locations for the first collection URI passed to SHOW BACKUP. As a result, SHOW BACKUP on a backup that contained incrementals would result in an error such as

ERROR: expected manifest
/20230510/160359.17/BACKUP_PART_1_zone=us-east not found in backup
locations

This only affected SHOW because of code in SHOW designed to support the user passing the URI to a specific full backup rather than a collection and a subdirectory.

This commit changes the CollectionAndSubdir function to support an array of backup locations.

Epic: none

Release note: Fixes a bug in which SHOW BACKUP would fail to show a locality-aware backup that contained incremental backups.

Release justification: Low risk bug fix.

Previously, SHOW BACKUP would only resolve incremental locations for
the first collection URI passed to SHOW BACKUP. As a result, SHOW
BACKUP on a backup that contained incrementals would result in an
error such as

    ERROR: expected manifest
    /20230510/160359.17/BACKUP_PART_1_zone=us-east not found in backup
    locations

This only affected `SHOW` because of code in `SHOW` designed to
support the user passing the URI to a specific full backup rather than
a collection and a subdirectory.

This commit changes the CollectionAndSubdir function to support an
array of backup locations.

Epic: none

Release note: Fixes a bug in which SHOW BACKUP would fail to show a
locality-aware backup that contained incremental backups.
@stevendanna stevendanna requested a review from a team as a code owner May 24, 2023 10:44
@stevendanna stevendanna requested review from rhu713 and removed request for a team May 24, 2023 10:44
@blathers-crl
Copy link

blathers-crl bot commented May 24, 2023

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

@stevendanna stevendanna requested a review from msbutler May 24, 2023 10:44
@stevendanna stevendanna merged commit 39a6c89 into cockroachdb:release-22.2 May 25, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants