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

protectedts: improve a test #72933

Merged
merged 1 commit into from
Nov 18, 2021

Conversation

andreimatei
Copy link
Contributor

This test was starting a Reconciler by hand, running against an existing
Server. The Reconciler was using the cluster's stopper (as opposed to
the server's stopper). In doing so, we ended up with two different Tracers
contributing to the same traces. This is pretty broken and will become
dissallowed. The patch fixes it by configuring the alien Reconciler with
the same stopper (and tracer) as the server it's running against.

Release note: None

This test was starting a Reconciler by hand, running against an existing
Server. The Reconciler was using the cluster's stopper (as opposed to
the server's stopper). In doing so, we ended up with two different Tracers
contributing to the same traces. This is pretty broken and will become
dissallowed. The patch fixes it by configuring the alien Reconciler with
the same stopper (and tracer) as the server it's running against.

Release note: None
@andreimatei andreimatei requested a review from ajwerner November 18, 2021 19:06
@andreimatei andreimatei requested a review from a team as a code owner November 18, 2021 19:06
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@ajwerner ajwerner 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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andreimatei)

Copy link
Contributor Author

@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.

bors r+

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

@craig
Copy link
Contributor

craig bot commented Nov 18, 2021

Build succeeded:

@craig craig bot merged commit dc87b82 into cockroachdb:master Nov 18, 2021
@andreimatei andreimatei deleted the tracing.stopper-reconciler branch January 22, 2022 22:06
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.

3 participants