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.

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

release-22.1: backupccl: stop logging unsanitized backup stmt in schedule executor #99284

Closed
wants to merge 2 commits into from
Closed

release-22.1: backupccl: stop logging unsanitized backup stmt in schedule executor #99284

wants to merge 2 commits into from

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 22, 2023 •
edited by dt
Loading

Backport 2/2 commits from #99150 on behalf of @msbutler.

/cc @cockroachdb/release

Informs #99145

Release note: None

Release justification: bug fix.

msbutler added 2 commits March 21, 2023 19:54
@msbutler
backupccl: stop logging unsanitized backup stmt in schedule executor
ad47ce5 
Informs #99145

Release note: None
@msbutler
backupccl: scrub backup stmt from return errors
8fc0a0a 
This patch ensures that no unsanitized uris or secret keys get written to the
jobs table if the backup fails.

Informs #99145

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.1-99150 branch 2 times, most recently from e938568 to 8fc0a0a Compare March 22, 2023 20:58
@blathers-crl blathers-crl bot requested review from dt and stevendanna March 22, 2023 20:58
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 22, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 22, 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

dt
dt approved these changes Mar 22, 2023
View reviewed changes
Copy link
Member

@dt dt left a comment

Choose a reason for hiding this comment

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

... I ... guess?

@msbutler
Copy link
Collaborator

Lol, 22.1 is good, hence the 0/0 diff.

Thanks for the close review though.

@msbutler msbutler closed this Mar 23, 2023
@dt
Copy link
Member

dt commented Mar 23, 2023

I mean I suppose you could merge it anyway so “was backported?” tools get arguably the right answer?

@rafiss rafiss deleted the blathers/backport-release-22.1-99150 branch June 24, 2023 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dt dt dt approved these changes

@stevendanna stevendanna Awaiting requested review from stevendanna

Assignees

@msbutler msbutler

Labels
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 @dt