sql: fix the session tracing in some cases#64766
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom May 6, 2021
Merged
sql: fix the session tracing in some cases#64766craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
When the session tracing is started, we might need to start two tracing spans: we always start a span for the connection, but also if we're inside of a txn, we start a separate span for the txn. Previously, the span of the previous txn wasn't properly cleaned up when the session tracing is started again outside of a txn, which resulted in old (irrelevant) entries being added to the newer trace. Now this is fixed. Additionally, this commit makes sure to finish the tracing spans (which wasn't done previously). Release note (bug fix): Previously, the session trace (i.e. `SHOW TRACE FOR SESSION`) could contain entries that corresponded to the previous trace (i.e. `SET TRACING=ON` didn't properly reset the trace). Now this is fixed.
irfansharif
approved these changes
May 6, 2021
Contributor
irfansharif
left a comment
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @andreimatei)
Member
Author
|
TFTR! bors r+ |
Contributor
|
Build succeeded: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When the session tracing is started, we might need to start two tracing
spans: we always start a span for the connection, but also if we're
inside of a txn, we start a separate span for the txn. Previously, the
span of the previous txn wasn't properly cleaned up when the session
tracing is started again outside of a txn, which resulted in old
(irrelevant) entries being added to the newer trace. Now this is fixed.
Additionally, this commit makes sure to finish the tracing spans (which
wasn't done previously).
Fixes: #59203.
Fixes: #60672.
Release note (bug fix): Previously, the session trace (i.e.
SHOW TRACE FOR SESSION) could contain entries that corresponded to the previoustrace (i.e.
SET TRACING=ONdidn't properly reset the trace). Now thisis fixed.