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.

Sign up for GitHub

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

Jump to bottom

store: add lock for runtime stats to fix panic caused by concurrent execution #18983

Merged
merged 7 commits into from
Aug 5, 2020
Merged

store: add lock for runtime stats to fix panic caused by concurrent execution #18983

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad07408
store: add lock to avoid concurrent panic
crazycs520 Aug 5, 2020
b3e48b8
add unit test to detect race
crazycs520 Aug 5, 2020
d89317b
Merge branch 'master' into fix-panix-map
crazycs520 Aug 5, 2020
0d90722
address comment
crazycs520 Aug 5, 2020
d6cc19c
Merge branch 'fix-panix-map' of https://github.com/crazycs520/tidb in…
crazycs520 Aug 5, 2020
86c2724
Merge branch 'master' into fix-panix-map
crazycs520 Aug 5, 2020
8440397
Merge branch 'master' into fix-panix-map
crazycs520 Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions executor/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ func (s *testSuiteJoin1) TestJoinPanic(c *C) {
tk.MustQuery("SELECT * FROM events e JOIN (SELECT MAX(clock) AS clock FROM events e2 GROUP BY e2.source) e3 ON e3.clock=e.clock")
err := tk.ExecToErr("SELECT * FROM events e JOIN (SELECT clock FROM events e2 GROUP BY e2.source) e3 ON e3.clock=e.clock")
c.Check(err, NotNil)

// Test for PR 18983, use to detect race.
tk.MustExec("use test")
tk.MustExec("drop table if exists tpj1,tpj2;")
tk.MustExec("create table tpj1 (id int, b int, unique index (id));")
tk.MustExec("create table tpj2 (id int, b int, unique index (id));")
tk.MustExec("insert into tpj1 values (1,1);")
tk.MustExec("insert into tpj2 values (1,1);")
tk.MustQuery("select tpj1.b,tpj2.b from tpj1 left join tpj2 on tpj1.id=tpj2.id where tpj1.id=1;").Check(testkit.Rows("1 1"))
}

func (s *testSuite) TestJoinInDisk(c *C) {
Expand Down
10 changes: 10 additions & 0 deletions store/tikv/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ func (s *tikvSnapshot) SetOption(opt kv.Option, val interface{}) {
case kv.TaskID:
s.taskID = val.(uint64)
case kv.CollectRuntimeStats:
s.mu.Lock()
s.stats = val.(*SnapshotRuntimeStats)
s.mu.Unlock()
}
}

Expand All @@ -462,7 +464,9 @@ func (s *tikvSnapshot) DelOption(opt kv.Option) {
case kv.ReplicaRead:
s.replicaRead = kv.ReplicaReadLeader
case kv.CollectRuntimeStats:
s.mu.Lock()
s.stats = nil
s.mu.Unlock()
qw4990 marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -584,6 +588,9 @@ func (s *tikvSnapshot) recordBackoffInfo(bo *Backoffer) {
}
s.mu.Lock()
defer s.mu.Unlock()
if s.stats == nil {
return
}
if s.stats.backoffSleepMS == nil {
s.stats.backoffSleepMS = bo.backoffSleepMS
s.stats.backoffTimes = bo.backoffTimes
Expand All @@ -600,6 +607,9 @@ func (s *tikvSnapshot) recordBackoffInfo(bo *Backoffer) {
func (s *tikvSnapshot) mergeRegionRequestStats(stats map[tikvrpc.CmdType]*RegionRequestRuntimeStats) {
s.mu.Lock()
defer s.mu.Unlock()
if s.stats == nil {
return
}
if s.stats.rpcStats == nil {
s.stats.rpcStats = stats
return
Expand Down