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.1: colexecdisk: add cancel checking for disk-spilling operators #88394

Merged
merged 1 commit into from
Sep 22, 2022

Conversation

yuzefovich
Copy link
Member

@yuzefovich yuzefovich commented Sep 21, 2022

Backport 1/1 commits from #88302.

/cc @cockroachdb/release


This commit adds the cancel checking to the methods of the disk queue as well as to the external operators themselves.

Fixes: #87482.

Release note (bug fix): CockroachDB now more promptly reacts to query cancellations (e.g. due to statement timeout being exceeded) after the query spilled to disk.

Release justification: bug fix.

@blathers-crl
Copy link

blathers-crl bot commented Sep 21, 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 adds the cancel checking to the methods of the disk queue as
well as to the external operators themselves.

Release note (bug fix): CockroachDB now more promptly reacts to query
cancellations (e.g. due to statement timeout being exceeded) after the
query spilled to disk.
@yuzefovich
Copy link
Member Author

Removed the gcassert:inline directive since it seems on the older Go versions selecting from a channel is not inlined. This shouldn't be a big issue anyway.

Copy link
Contributor

@cucaroach cucaroach left a comment

Choose a reason for hiding this comment

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

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

@yuzefovich yuzefovich merged commit 98e30d0 into cockroachdb:release-22.1 Sep 22, 2022
@yuzefovich yuzefovich deleted the backport22.1-88302 branch September 22, 2022 00:26
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