Skip to content

release-25.2: backup: add cluster setting to skip compacted backups during restore #144315

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: release-25.2
Choose a base branch
from
Open

release-25.2: backup: add cluster setting to skip compacted backups during restore #144315

wants to merge 2 commits into from

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Apr 11, 2025 •
edited by kev-cao
Loading

Backport 2/2 commits from #143932 on behalf of @kev-cao.

/cc @cockroachdb/release

This patch adds the cluster setting restore.compacted_backups.enabled to allow skipping compacted backups during a restore operation.

Epic: None

Release note: None

Release justification: In the event of a corrupted compacted backup, this cluster setting will allow users to restore from the original chain and keep the backup restorable.

kev-cao added 2 commits April 3, 2025 20:24
@kev-cao
backup: add is_compacted field to backup manifest
70dfd5e 
This commit adds an `is_compacted` field to the backup manifest,
allowing us to easily detect when a manifest represents a compacted
backup.

Epic: None

Release note: None
@kev-cao
backup: add cluster setting to skip compacted backups during restore
6ae0acf 
This patch adds the cluster setting `restore.compacted_backups.enabled`
to allow skipping compacted backups during a restore operation.

Epic: None

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner April 11, 2025 20:07
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-25.2-143932 branch from 3bab13f to 6ae0acf Compare April 11, 2025 20:07
@blathers-crl blathers-crl bot requested review from kev-cao and removed request for a team April 11, 2025 20:07
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 11, 2025
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Apr 11, 2025

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot requested review from jeffswenson and msbutler April 11, 2025 20:07
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Apr 11, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msbutler msbutler msbutler approved these changes

@kev-cao kev-cao Awaiting requested review from kev-cao kev-cao is a code owner automatically assigned from cockroachdb/disaster-recovery

@jeffswenson jeffswenson Awaiting requested review from jeffswenson

Assignees

@kev-cao kev-cao

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @msbutler @kev-cao