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: colexec: protect columnarizer when closing not started input #91481

Closed

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 8, 2022

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

/cc @cockroachdb/release


This commit makes sure that the columnarizer calls InternalClose only if it has been initialized. Previously, if Columnarizer.Init wasn't performed (most likely due to a panic in Init of another operator), the columnarizer's input would not be started, so when InternalClose called input.ConsumerClosed, that could lead to a nil pointer panic since input.Ctx would be nil if the input tried to do some logging (some processors do that). We now protect against this by short-circuiting InternalClose call altogether, similar to what we do in Columnarizer.DrainMeta. This makes it so that the columnarizer satisfies Closer.Close contract properly.

Fixes: #84902.

Release note: None


Release justification: bug fix.

@blathers-crl blathers-crl bot requested a review from a team as a code owner November 8, 2022 12:02
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-91446 branch from 476e7c6 to 3dfeb20 Compare November 8, 2022 12:02
@blathers-crl blathers-crl bot requested a review from cucaroach November 8, 2022 12:02
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 8, 2022
@blathers-crl
Copy link
Author

blathers-crl bot commented Nov 8, 2022

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

This commit makes sure that the columnarizer calls `InternalClose` only
if it has been initialized. Previously, if `Columnarizer.Init` wasn't
performed (most likely due to a panic in `Init` of another operator),
the columnarizer's input would not be started, so when `InternalClose`
called `input.ConsumerClosed`, that could lead to a nil pointer panic
since `input.Ctx` would be `nil` if the input tried to do some logging
(some processors do that). We now protect against this by
short-circuiting `InternalClose` call altogether, similar to what we do
in `Columnarizer.DrainMeta`. This makes it so that the columnarizer
satisfies `Closer.Close` contract properly.

Release note: None
@yuzefovich yuzefovich force-pushed the blathers/backport-release-22.2-91446 branch from 3dfeb20 to 01c898a Compare November 8, 2022 18:03
@yuzefovich
Copy link
Member

This can be flaky in tests, will implement a different solution.

@yuzefovich yuzefovich closed this Nov 16, 2022
@yuzefovich yuzefovich deleted the blathers/backport-release-22.2-91446 branch November 16, 2022 02:31
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.

2 participants