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-25.1: sql: don't disable streamer due to scanBufferNode #143167

Merged
merged 1 commit into from
Mar 20, 2025

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 19, 2025

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

/cc @cockroachdb/release


In ed3f640 we disabled the streamer
whenever the plan contains LocalPlanNode processor (which is just
a wrapper around a planNode). This was done to prevent misuse of the
txn API, and we knew at the time that we were disabling the streamer in
more cases than strictly necessary. We just saw a support case where it
was disabled due to scanBufferNode, so this commit includes
scanBufferNode and bufferNode into the allow-list of planNodes that
don't disable the streamer (since these don't interact with internal
executors or the txn in any way).

Also add a few trace messages around this code.

Epic: None
Release note: None


Release justification: low-risk improvement.

@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-25.1-143151 branch from 0c43ba9 to c1fb3d5 Compare March 19, 2025 22:35
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 19, 2025 22:35
@blathers-crl blathers-crl bot removed the request for review from a team March 19, 2025 22:35
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 19, 2025
@blathers-crl blathers-crl bot requested a review from michae2 March 19, 2025 22:35
Copy link
Author

blathers-crl bot commented Mar 19, 2025

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot requested a review from DrewKimball March 19, 2025 22:35
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Mar 19, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich yuzefovich force-pushed the blathers/backport-release-25.1-143151 branch from c1fb3d5 to 9de7529 Compare March 20, 2025 01:24
@yuzefovich yuzefovich requested a review from mgartner March 20, 2025 01:25
In ed3f640 we disabled the streamer
whenever the plan contains LocalPlanNode processor (which is just
a wrapper around a `planNode`). This was done to prevent misuse of the
txn API, and we knew at the time that we were disabling the streamer in
more cases than strictly necessary. We just saw a support case where it
was disabled due to `scanBufferNode`, so this commit includes
`scanBufferNode` and `bufferNode` into the allow-list of planNodes that
don't disable the streamer (since these don't interact with internal
executors or the txn in any way).

Also add a few trace messages around this code.

Release note: None
@yuzefovich yuzefovich force-pushed the blathers/backport-release-25.1-143151 branch from 9de7529 to 0dfc7b5 Compare March 20, 2025 02:31
Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm: Nice!

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

@yuzefovich yuzefovich merged commit 9fd3214 into release-25.1 Mar 20, 2025
15 of 16 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-25.1-143151 branch March 20, 2025 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. target-release-25.1.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants