sql: fix race in execStmtInOpenState #53574
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 change is |
Fixes cockroachdb#53573 Release justification: low-risk update to new functionality Release note: None
jordanlewis
approved these changes
Aug 31, 2020
knz
reviewed
Aug 31, 2020
| @@ -244,7 +244,10 @@ func (ex *connExecutor) execStmtInOpenState( | |||
| ex.incrementExecutedStmtCounter(stmt) | |||
| } | |||
| }() | |||
|
|
|||
| ex.state.mu.Lock() | |||
| ex.state.mu.stmtCount++ | |||
There was a problem hiding this comment.
I wonder if it's worth using atomic increments and loads for this one
There was a problem hiding this comment.
Yeah I suppose that would be better, but I think lock contention will be quite rare here so I'm going to go ahead and merge as-is for now since this is affecting multiple tests.
|
bors r+ |
|
This PR was included in a batch that was canceled, it will be automatically retried |
|
Build succeeded: |
This was referenced Sep 1, 2020
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.
Fixes #53573
Release justification: low-risk update to new functionality
Release note: None