executor: fix the data race on TestDataForTableStatsField and TestPartitionsTable #15260
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
ghost
requested review from
qw4990 and
SunRunAway
and removed request for
a team
Codecov Report
@@ Coverage Diff @@
## master #15260 +/- ##
================================================
- Coverage 80.4203% 80.3498% -0.0706%
================================================
Files 503 503
Lines 133087 132925 -162
================================================
- Hits 107029 106805 -224
- Misses 17670 17717 +47
- Partials 8388 8403 +15 |
SunRunAway
reviewed
Mar 10, 2020
| @@ -201,7 +198,7 @@ func (c *statsCache) setLoading(loading bool) { | |||
|
|
|||
| func (c *statsCache) get(ctx sessionctx.Context) (map[int64]uint64, map[tableHistID]uint64, error) { | |||
| c.mu.Lock() | |||
| if time.Since(c.modifyTime) < TableStatsCacheExpiry || c.loading { | |||
There was a problem hiding this comment.
Could we accept this change?
|
/run-all-tests |
crazycs520
reviewed
Mar 10, 2020
SunRunAway
reviewed
Mar 10, 2020
| tableRows, colLength := c.tableRows, c.colLength | ||
| c.mu.Unlock() | ||
| return tableRows, colLength, nil | ||
| } | ||
| c.loading = true | ||
| c.mu.Unlock() | ||
|
|
||
| tableRows, err := getRowCountAllTable(ctx) | ||
| if err != nil { |
There was a problem hiding this comment.
if this err happens, it will deadlock.
Prefer to use defer in this situation.
c.mu.Lock()
defer c.mu.Unlock()
There was a problem hiding this comment.
For best performance, we can use sync.RWMutex here.
// fast path
c.mu.RLock()
if time.Since(c.modifyTime) < TableStatsCacheExpiry {
tableRows, colLength := c.tableRows, c.colLength
c.mu.RUnlock()
return tableRows, colLength, nil
}
c.mu.RUnlock()
c.mu.Lock()
defer c.mu.Unlock()
if time.Since(c.modifyTime) < TableStatsCacheExpiry {
return c.tableRows, c.colLength, nil
}
// slow path: fetch from remote
SunRunAway
reviewed
Mar 10, 2020
executor/infoschema_reader.go
Outdated
| c.tableRows = tableRows | ||
| c.colLength = colLength | ||
| c.modifyTime = time.Now() | ||
| c.loading = true |
There was a problem hiding this comment.
I donot think c.loading is useful anymore. Since the entire get function is locked.
SunRunAway
added
the
status/can-merge
|
/run-all-tests |
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.
What problem does this PR solve?
fix #15226 , fix #15222
What is changed and how it works?
Check List
Tests