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: always track opened writer #104207

Merged
merged 1 commit into from Jun 1, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 1, 2023

Backport 1/1 commits from #104187 on behalf of @dt.

/cc @cockroachdb/release


Previously we would do things -- like wrap the opened writer with an encryption shim -- after opening the writer but before storing it in the sink. This could mean that if the sink opened a writer, but failed to save it, and was then closed it would fail to close the writer. This changes that, so that as soon as the writer is opened it is saved and then if it is later wrapped, saved again, to ensure that we cannot lose track of any successfully opened writer.

Fixes: #103597.

Release note: none.


Release justification: bug fix.

Previously we would do things -- like wrap the opened writer with an encryption shim --
after opening the writer but before storing it in the sink. This could mean that if the
sink opened a writer, but failed to save it, and was then closed it would fail to close
the writer. This changes that, so that as soon as the writer is opened it is saved and
then if it is later wrapped, saved again, to ensure that we cannot lose track of any
successfully opened writer.

Fixes: #103597.

Release note: none.
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 1, 2023 14:47
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-104187 branch from 84a410b to f80d35f Compare June 1, 2023 14:47
@blathers-crl blathers-crl bot requested review from rhu713 and removed request for a team June 1, 2023 14:47
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 1, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-104187 branch from e409d6a to 77253be Compare June 1, 2023 14:47
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 1, 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?

@blathers-crl blathers-crl bot assigned dt Jun 1, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 1, 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
Member

This change is Reviewable

@adityamaru adityamaru merged commit 82c5c2e into release-22.2 Jun 1, 2023
6 checks passed
@adityamaru adityamaru deleted the blathers/backport-release-22.2-104187 branch June 1, 2023 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants