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: sql: remove the artifact of canceling the txn-scoped context #84782

Merged
merged 2 commits into from
Aug 2, 2022

Conversation

yuzefovich
Copy link
Member

@yuzefovich yuzefovich commented Jul 21, 2022

Backport 1/1 commits from #84628.
Backport 1/1 commits from #84851.

/cc @cockroachdb/release


This commit removes an old artifact of having a txn-scoped context
cancellation that is performed when finishing the txn. As Andrei points
out, this txn-scoped cancellation is likely a leftover from ancient
times and is no longer needed. In particular, this also fixes the bug of
using the span after it was finished (which would occur with high
vmodule on context.go file).

Fixes: #84890.

Release note: None

Release justification: bug fix.

This commit removes an old artifact of having a txn-scoped context
cancellation that is performed when finishing the txn. As Andrei points
out, this txn-scoped cancellation is likely a leftover from ancient
times and is no longer needed. In particular, this also fixes the bug of
using the span after it was finished (which would occur with high
vmodule on `context.go` file).

Release note: None
@blathers-crl
Copy link

blathers-crl bot commented Jul 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

Copy link
Contributor

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

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

I wouldn't backport this so soon (or at all); I think changing what ctx gets canceled has potential implications we're not aware of.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @mgartner)

@yuzefovich
Copy link
Member Author

Yeah, I was going to let this bake for a bit on master, but now I'm even more worried about this backport. WDYT about backporting my original version of the fix where put the finish of the hi-jacked span into the cancel function? That seems much safer, yet it still fixes test flakes like #84634 on 22.1 branch.

@yuzefovich
Copy link
Member Author

I propose we let it bake for a week, and if nothing new comes up, we merge it - we do wanna fix the #84890 flake 😄

@yuzefovich
Copy link
Member Author

@mgartner @andreimatei we haven't seen any fallout on master from this change plus 22.1.5 has just been published, so it seems that now is the perfect time to merge this.

Copy link
Collaborator

@mgartner mgartner left a comment

Choose a reason for hiding this comment

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

:lgtm:

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

@yuzefovich yuzefovich merged commit 6c15496 into cockroachdb:release-22.1 Aug 2, 2022
@yuzefovich yuzefovich deleted the backport22.1-84628 branch August 2, 2022 14:25
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.

4 participants