fix

Signed-off-by: Ryan Leung <[email protected]>
rleungx · Jan 16, 2024 · 73fe9bf · 73fe9bf
1 parent 1bca504
commit 73fe9bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/schedule/prepare_checker.go b/pkg/schedule/prepare_checker.go
@@ -61,7 +61,7 @@ func (checker *prepareChecker) check(c *core.BasicCluster, collectWaitTime ...ti
 		}
 		storeID := store.GetID()
 		// It is used to avoid sudden scheduling when scheduling service is just started.
-		if len(collectWaitTime) > 0 && float64(store.GetRegionCount())*collectFactor > float64(c.GetNotFromStorageRegionsCntByStore(storeID)) {
+		if len(collectWaitTime) > 0 && (float64(store.GetStoreStats().GetRegionCount())*collectFactor > float64(c.GetNotFromStorageRegionsCntByStore(storeID))) {
 			return false
 		}
 		// For each store, the number of active regions should be more than total region of the store * collectFactor

diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -1290,7 +1290,7 @@ func (s *GrpcServer) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error
 
 		err = rc.HandleRegionHeartbeat(region)
 		if err != nil {
-			regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "err").Inc()
+		regionHeartbeatCounter.WithLabelValues(storeAddress, storeLabel, "report", "err").Inc()
 			msg := err.Error()
 			s.hbStreams.SendErr(pdpb.ErrorType_UNKNOWN, msg, request.GetLeader())
 			continue