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

mocktikv: fix data race in mocktikv split (#12414) #19711

Merged
merged 2 commits into from
Sep 3, 2020
+5 −5
Merged

mocktikv: fix data race in mocktikv split (#12414) #19711

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1c7ca1
cherry pick #12414 to release-3.0
lysu Oct 11, 2019
91ba20d
Merge branch 'release-3.0' into release-3.0-ea6d508d9b43
ti-srebot Sep 3, 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
6 changes: 4 additions & 2 deletions store/mockstore/mocktikv/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,15 @@ func (c *Cluster) Split(regionID, newRegionID uint64, key []byte, peerIDs []uint
}

// SplitRaw splits a Region at the key (not encoded) and creates new Region.
func (c *Cluster) SplitRaw(regionID, newRegionID uint64, rawKey []byte, peerIDs []uint64, leaderPeerID uint64) *Region {
func (c *Cluster) SplitRaw(regionID, newRegionID uint64, rawKey []byte, peerIDs []uint64, leaderPeerID uint64) *metapb.Region {
c.Lock()
defer c.Unlock()

newRegion := c.regions[regionID].split(newRegionID, rawKey, peerIDs, leaderPeerID)
c.regions[newRegionID] = newRegion
return newRegion
// The mocktikv should return a deep copy of meta info to avoid data race
meta := proto.Clone(newRegion.Meta)
return meta.(*metapb.Region)
}

// Merge merges 2 regions, their key ranges should be adjacent.
Expand Down
4 changes: 1 addition & 3 deletions store/mockstore/mocktikv/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,7 @@ func (h *rpcHandler) handleSplitRegion(req *kvrpcpb.SplitRegionRequest) *kvrpcpb
}
newRegionID, newPeerIDs := h.cluster.AllocID(), h.cluster.AllocIDs(len(region.Peers))
newRegion := h.cluster.SplitRaw(region.GetId(), newRegionID, k, newPeerIDs, newPeerIDs[0])
// The mocktikv should return a deep copy of meta info to avoid data race
metaCloned := proto.Clone(newRegion.Meta)
resp.Regions = append(resp.Regions, metaCloned.(*metapb.Region))
resp.Regions = append(resp.Regions, newRegion)
}
return resp
}
Expand Down