Skip to content

distsql: finish the tracing span later in an error case#86618

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
yuzefovich:fix-span-use
Aug 23, 2022
Merged

distsql: finish the tracing span later in an error case#86618
craig[bot] merged 1 commit intocockroachdb:masterfrom
yuzefovich:fix-span-use

Conversation

@yuzefovich
Copy link
Copy Markdown
Member

Previously, it was possible to run the finished tracing span when
setting up the remote DistSQL flow if that setup encounters an error. In
such a scenario, we need to clean up the resources explicitly, and the
order of that cleanup was incorrect - we would finish the span before
possibly using the context that is still referencing the finished span.
This is now fixed.

Fixes: #86369.

Release justification: bug fix.

Release note: None

Previously, it was possible to run the finished tracing span when
setting up the remote DistSQL flow if that setup encounters an error. In
such a scenario, we need to clean up the resources explicitly, and the
order of that cleanup was incorrect - we would finish the span before
possibly using the context that is still referencing the finished span.
This is now fixed.

Release justification: bug fix.

Release note: None
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm: Nice!

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

@yuzefovich
Copy link
Copy Markdown
Member Author

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 23, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 23, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 23, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 23, 2022

Build succeeded:

@craig craig bot merged commit 281e642 into cockroachdb:master Aug 23, 2022
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 23, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from ebde53c to blathers/backport-release-22.1-86618: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

pkg/sql/logictest/tests/fakedist/fakedist_test: TestLogic_vectorize failed

3 participants