cherry pick pingcap#12414 to release-3.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Sep 2, 2020 · c1c7ca1 · c1c7ca1
1 parent 11a9b55
commit c1c7ca1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/store/mockstore/mocktikv/cluster.go b/store/mockstore/mocktikv/cluster.go
@@ -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.

diff --git a/store/mockstore/mocktikv/rpc.go b/store/mockstore/mocktikv/rpc.go
@@ -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
 }