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-21.2: colexecop: harden CloseAndLogOnErr against panics #70509

Merged
merged 1 commit into from
Sep 21, 2021

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 21, 2021

Backport 1/1 commits from #70467 on behalf of @yuzefovich.

/cc @cockroachdb/release


We have seen a few cases where closing the Closers would lead to
a panic which wasn't caught because we're outside of the panic-catcher
scope. This commit adds a panic-catcher to CloseAndLogOnErr (which is
the "root" way of closing things) in order to increase the stability of
CRDB in face of edge case bugs.

Addresses: #70000.
Addresses: #70438.

Release note: None


Release justification:

We have seen a few cases where closing the `Closer`s would lead to
a panic which wasn't caught because we're outside of the panic-catcher
scope. This commit adds a panic-catcher to `CloseAndLogOnErr` (which is
the "root" way of closing things) in order to increase the stability of
CRDB in face of edge case bugs.

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.2-70467 branch from 75346a4 to 62cffb9 Compare September 21, 2021 17:59
@blathers-crl blathers-crl bot requested a review from rytaft September 21, 2021 17:59
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 21, 2021

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues.
  • 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

@yuzefovich
Copy link
Member

I'd like to get this in for 21.2.0, cc @rytaft.

Copy link
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

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

:lgtm:

Since this is addressing the same issue we already discussed in the meeting, I think you can go ahead and merge.

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)

@yuzefovich yuzefovich merged commit db7de99 into release-21.2 Sep 21, 2021
@yuzefovich yuzefovich deleted the blathers/backport-release-21.2-70467 branch September 21, 2021 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants