-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
release-22.1: sql: remove the artifact of canceling the txn-scoped context #84782
Conversation
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
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
There was a problem hiding this 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:
complete! 0 of 0 LGTMs obtained (waiting on @mgartner)
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. |
Release note: None
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 😄 |
@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. |
There was a problem hiding this 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, 1 of 1 files at r2, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)
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.