server: fix the dead lock in scatter region (#1706)

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Aug 26, 2019 · 14b91e8 · 14b91e8
1 parent 141496b
commit 14b91e8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/server/cluster.go b/server/cluster.go
@@ -293,6 +293,20 @@ func (c *RaftCluster) GetOperatorController() *schedule.OperatorController {
 	return c.coordinator.opController
 }
 
+// GetHeartbeatStreams returns the heartbeat streams.
+func (c *RaftCluster) GetHeartbeatStreams() *heartbeatStreams {
+	c.RLock()
+	defer c.RUnlock()
+	return c.coordinator.hbStreams
+}
+
+// GetCoordinator returns the coordinator.
+func (c *RaftCluster) GetCoordinator() *coordinator {
+	c.RLock()
+	defer c.RUnlock()
+	return c.coordinator
+}
+
 // handleStoreHeartbeat updates the store status.
 func (c *RaftCluster) handleStoreHeartbeat(stats *pdpb.StoreStats) error {
 	c.Lock()

diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -361,9 +361,7 @@ func (s *Server) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error {
 		regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "recv").Inc()
 		regionHeartbeatLatency.WithLabelValues(storeAddress, storeLabel).Observe(float64(time.Now().Unix()) - float64(request.GetInterval().GetEndTimestamp()))
 
-		cluster.RLock()
-		hbStreams := cluster.coordinator.hbStreams
-		cluster.RUnlock()
+		hbStreams := cluster.GetHeartbeatStreams()
 
 		if time.Since(lastBind) > s.cfg.HeartbeatStreamBindInterval.Duration {
 			regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "bind").Inc()
@@ -633,9 +631,7 @@ func (s *Server) ScatterRegion(ctx context.Context, request *pdpb.ScatterRegionR
 		return nil, errors.Errorf("region %d is a hot region", region.GetID())
 	}
 
-	cluster.RLock()
-	defer cluster.RUnlock()
-	co := cluster.coordinator
+	co := cluster.GetCoordinator()
 	op, err := co.regionScatterer.Scatter(region)
 	if err != nil {
 		return nil, err