distsqlrun: fix panic due to multiple calls to tracing.FinishSpan #39606
Conversation
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
|
This change is |
nvanbenschoten
approved these changes
Aug 12, 2019
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde and @tbg)
|
Thanks to you and @tbg for the reproduction steps! @RaduBerinde is OOO, so maybe @jordanlewis could take a look from the DistSQL perspective? |
This commit removes calls to tracing.FinishSpan from the samplerProcessor and sampleAggregatorProcessor. These calls are no longer necessary after memory accounting was added in cockroachdb#39144, which includes a call to tracing.FinishSpan in InternalClose(). Fixes cockroachdb#39262 Release note: None
rytaft
force-pushed
the
fix-double-finish
branch
from
1e31863 to
9bc96c8
Compare
|
@rytaft he's out too. I'll see if anyone else can take a look. |
yuzefovich
approved these changes
Aug 13, 2019
There was a problem hiding this comment.
Reviewable status:
|
TFTR! bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Aug 13, 2019
39606: distsqlrun: fix panic due to multiple calls to tracing.FinishSpan r=rytaft a=rytaft This commit removes calls to `tracing.FinishSpan` from the `samplerProcessor` and `sampleAggregatorProcessor`. These calls are no longer necessary after memory accounting was added in #39144, which includes a call to `tracing.FinishSpan` in `InternalClose()`. Fixes #39262 Release note: None Co-authored-by: Rebecca Taft <[email protected]>
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit removes calls to
tracing.FinishSpanfrom thesamplerProcessorand
sampleAggregatorProcessor. These calls are no longer necessary aftermemory accounting was added in #39144, which includes a call to
tracing.FinishSpanin
InternalClose().Fixes #39262
Release note: None