From 73fe9bf658b6dc0a010cd1d6824021a4837513d3 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Tue, 16 Jan 2024 17:16:46 +0800 Subject: [PATCH] fix Signed-off-by: Ryan Leung --- pkg/schedule/prepare_checker.go | 2 +- server/grpc_service.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/schedule/prepare_checker.go b/pkg/schedule/prepare_checker.go index aa1aa72df0aa..126e3bba41d3 100644 --- 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 index a238cc780aa3..bf59e6d65497 100644 --- 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