Skip to content

backupccl: stop logging unsanitized backup stmt in schedule executor#99150

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
msbutler:butler-redact-backup-stmt-2
Mar 22, 2023
Merged

backupccl: stop logging unsanitized backup stmt in schedule executor#99150
craig[bot] merged 2 commits intocockroachdb:masterfrom
msbutler:butler-redact-backup-stmt-2

Conversation

@msbutler
Copy link
Copy Markdown
Collaborator

Informs #99145

Release note: None

@msbutler msbutler requested a review from dt March 21, 2023 20:17
@msbutler msbutler requested a review from a team as a code owner March 21, 2023 20:17
@msbutler msbutler self-assigned this Mar 21, 2023
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Mar 21, 2023

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

@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.

👍 Thanks for fixing this up.

If we wanted to go a bit further, we have some code in this file for creating redacted backup statements. We could print a redacted backup statement rather than just the schedule ID if we saw value in having the whole statement.

But, I personally thing that just the ID is fine.

@msbutler msbutler added the backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only label Mar 22, 2023
@msbutler
Copy link
Copy Markdown
Collaborator Author

bors r=stevendanna

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 22, 2023

Build failed:

@msbutler
Copy link
Copy Markdown
Collaborator Author

bors r=retry

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 22, 2023

Build failed (retrying...):

@msbutler
Copy link
Copy Markdown
Collaborator Author

bors r-

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 22, 2023

Canceled.

This patch ensures that no unsanitized uris or secret keys get written to the
jobs table if the backup fails.

Informs cockroachdb#99145

Release note: None
@msbutler
Copy link
Copy Markdown
Collaborator Author

bors r=stevendanna

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 22, 2023

Build succeeded:

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

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only T-disaster-recovery

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants