backfill: fix possible race in tests #106224
Merged
Conversation
This file contains 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 commit addresses a race when `Push`ing into `execinfra.RowReceiver` which can happen in tests. In particular, when `PushesProgressEveryChunk` testing knob is set, there is a concurrency between the main waiter goroutine and worker goroutine, so we now add a mutex around that `Push`. In theory, `RowReceiver.Push` claims to be thread-safe, so it shouldn't be necessary, but two implementations (`DistSQLReceiver` and `copyingRowReceiver`) are actually not thread-safe, and fixing that is left as a TODO. Release note: None
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
|
@cockroachdb/sql-queries could someone take a look since Tommy is out? It's a very small change. |
michae2
approved these changes
Jul 10, 2023
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @cucaroach)
|
TFTR! bors r+ |
|
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 addresses a race when
Pushing intoexecinfra.RowReceiverwhich can happen in tests. In particular, whenPushesProgressEveryChunktesting knob is set, there is a concurrency between the main waiter goroutine and worker goroutine, so we now add a mutex around thatPush. In theory,RowReceiver.Pushclaims to be thread-safe, so it shouldn't be necessary, but two implementations (DistSQLReceiverandcopyingRowReceiver) are actually not thread-safe, and fixing that is left as a TODO.Fixes: #106161.
Release note: None