Skip to content

backup: fix panic on encrypted incremental after non-encrypted backup#141446

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
kev-cao:backup/encryption-panic
Feb 14, 2025
Merged

backup: fix panic on encrypted incremental after non-encrypted backup#141446
craig[bot] merged 1 commit intocockroachdb:masterfrom
kev-cao:backup/encryption-panic

Conversation

@kev-cao
Copy link
Copy Markdown
Contributor

@kev-cao kev-cao commented Feb 13, 2025

When attempting an encrypted backup on a non-encrypted backup chain, an error should be surfaced to the user indicating an error and inability to do so. Due to a missing error check, this currently panics.

Epic: none

Release note: None

When attempting an encrypted backup on a non-encrypted backup chain, an
error should be surfaced to the user indicating an error and inability
to do so. Due to a missing error check, this currently panics.

Epic: none

Release note: None
@kev-cao kev-cao requested a review from msbutler February 13, 2025 20:06
@kev-cao kev-cao requested a review from a team as a code owner February 13, 2025 20:06
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Feb 13, 2025

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@msbutler msbutler left a comment

Choose a reason for hiding this comment

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

woah! nice find! this needs to be backported to 24.3

@kev-cao
Copy link
Copy Markdown
Contributor Author

kev-cao commented Feb 14, 2025

@msbutler Actually this was introduced by the backup compactions code and it hasn't made it into any of the releases (including 25.1).

@kev-cao
Copy link
Copy Markdown
Contributor Author

kev-cao commented Feb 14, 2025

TFTR!

bors r=msbutler

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 14, 2025

@craig craig bot merged commit e08af3f into cockroachdb:master Feb 14, 2025
19 checks passed
@kev-cao kev-cao deleted the backup/encryption-panic branch February 28, 2025 16:04
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