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

kv: deflake raceTransport after pass-by-ref BatchRequest #91031

Merged

Conversation

nvanbenschoten
Copy link
Member

@nvanbenschoten nvanbenschoten commented Oct 31, 2022

This commit fixes the broken compilation of raceTransport, which was broken by e822649. That commit made its way through CI without triggering a race build with the silent log:

changed many packages; skipping race detector tests

This commit also fixes a few tests that now fail under race due to the raceTransport by shallow cloning the BatchRequest before mutation in the DistSender.sendToReplicas and TracingInternalClient.Batch.

Epic: None

Release note: None

This commit fixes the broken compilation of `raceTransport`, which
was broken by e822649. That commit made its way through CI without
triggering a race build with the silent log:
`changed many packages; skipping race detector tests`

This commit also fixes a few tests that now fail under race due to the
`raceTransport` by shallow cloning the BatchRequest before mutation in
the `DistSender.sendToReplicas` and `TracingInternalClient.Batch`.

Epic: None

Release note: None
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner October 31, 2022 22:18
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@arulajmani arulajmani left a 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, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nvanbenschoten)

@nvanbenschoten
Copy link
Member Author

TFTR!

bors r=arulajmani

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build failed:

@nvanbenschoten
Copy link
Member Author

Bors failed on TestPartialZip, which is resolved by the revert in #91043.

bors r=arulajmani

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build failed (retrying...):

@nvanbenschoten
Copy link
Member Author

bors r-

Flake on TestExternalSortMemoryAccounting, which was meant to be resolved by #91008. See https://cockroachlabs.slack.com/archives/C016CAD2HQ8/p1667251438538819.

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Canceled.

@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build succeeded:

@craig craig bot merged commit 18675b7 into cockroachdb:master Nov 1, 2022
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/passByRefFlake branch November 1, 2022 05:34
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