store/mockstore/mocktikv: fix DATA RACE to make unit test stable (#11921)

lonng · web-flow · commit 8c5f4c766eb9 · 2019-08-28T23:35:16.000+08:00
Signed-off-by: Lonng &lt;heng@lonng.org&gt;
diff --git a/store/mockstore/mocktikv/rpc.go b/store/mockstore/mocktikv/rpc.go
@@ -611,7 +611,9 @@ 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, key, newPeerIDs, newPeerIDs[0])
-	return &kvrpcpb.SplitRegionResponse{Left: newRegion.Meta}
+	// The mocktikv should return a deep copy of meta info to avoid data race
+	metaCloned := proto.Clone(newRegion.Meta)
+	return &kvrpcpb.SplitRegionResponse{Left: metaCloned.(*metapb.Region)}
 }
 
 // RPCClient sends kv RPC calls to mock cluster. RPCClient mocks the behavior of

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,9 @@ func (h rpcHandler) handleSplitRegion(req kvrpcpb.SplitRegionRequest) *kvrpcpb`
`611`	`611`	`}`
`612`	`612`	`newRegionID, newPeerIDs := h.cluster.AllocID(), h.cluster.AllocIDs(len(region.Peers))`
`613`	`613`	`newRegion := h.cluster.SplitRaw(region.GetId(), newRegionID, key, newPeerIDs, newPeerIDs[0])`
`614`		`- return &kvrpcpb.SplitRegionResponse{Left: newRegion.Meta}`
	`614`	`+ // The mocktikv should return a deep copy of meta info to avoid data race`
	`615`	`+ metaCloned := proto.Clone(newRegion.Meta)`
	`616`	`+ return &kvrpcpb.SplitRegionResponse{Left: metaCloned.(*metapb.Region)}`
`615`	`617`	`}`
`616`	`618`
`617`	`619`	`// RPCClient sends kv RPC calls to mock cluster. RPCClient mocks the behavior of`