fix

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Jun 28, 2024 · a53ebc0 · a53ebc0
1 parent 905945f
commit a53ebc0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/pkg/core/region.go b/pkg/core/region.go
@@ -44,6 +44,7 @@ import (
 const (
 	randomRegionMaxRetry = 10
 	scanRegionLimit      = 1000
+	CollectFactor        = 0.9
 )
 
 // errRegionIsStale is error info for region is stale.
@@ -1583,6 +1584,12 @@ func (r *RegionsInfo) GetNotFromStorageRegionsCntByStore(storeID uint64) int {
 	return r.getNotFromStorageRegionsCntByStoreLocked(storeID)
 }
 
+// IsStorePrepared checks if a store is prepared.
+// For each store, the number of active regions should be more than total region of the store * CollectFactor
+func (r *RegionsInfo) IsStorePrepared(storeID uint64) bool {
+	return float64(r.GetNotFromStorageRegionsCntByStore(storeID)) >= float64(r.GetStoreRegionCount(storeID))*CollectFactor
+}
+
 // getNotFromStorageRegionsCntByStoreLocked gets the `NotFromStorageRegionsCnt` count of a store's leader, follower and learner by storeID.
 func (r *RegionsInfo) getNotFromStorageRegionsCntByStoreLocked(storeID uint64) int {
 	return r.leaders[storeID].notFromStorageRegionsCount() + r.followers[storeID].notFromStorageRegionsCount() + r.learners[storeID].notFromStorageRegionsCount()

diff --git a/pkg/schedule/coordinator.go b/pkg/schedule/coordinator.go
@@ -46,7 +46,6 @@ import (
 const (
 	runSchedulerCheckInterval  = 3 * time.Second
 	checkSuspectRangesInterval = 100 * time.Millisecond
-	CollectFactor              = 0.9
 	collectTimeout             = 5 * time.Minute
 	maxLoadConfigRetries       = 10
 	// pushOperatorTickInterval is the interval try to push the operator.

diff --git a/pkg/schedule/prepare_checker.go b/pkg/schedule/prepare_checker.go
@@ -51,8 +51,8 @@ func (checker *prepareChecker) check(c *core.BasicCluster, collectWaitTime ...ti
 	}
 	notLoadedFromRegionsCnt := c.GetClusterNotFromStorageRegionsCnt()
 	totalRegionsCnt := c.GetTotalRegionCount()
-	// The number of active regions should be more than total region of all stores * CollectFactor
-	if float64(totalRegionsCnt)*CollectFactor > float64(notLoadedFromRegionsCnt) {
+	// The number of active regions should be more than total region of all stores * core.CollectFactor
+	if float64(totalRegionsCnt)*core.CollectFactor > float64(notLoadedFromRegionsCnt) {
 		return false
 	}
 	for _, store := range c.GetStores() {
@@ -61,11 +61,10 @@ 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.GetStoreStats().GetRegionCount())*CollectFactor > float64(c.GetNotFromStorageRegionsCntByStore(storeID))) {
+		if len(collectWaitTime) > 0 && (float64(store.GetStoreStats().GetRegionCount())*core.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
-		if float64(c.GetStoreRegionCount(storeID))*CollectFactor > float64(c.GetNotFromStorageRegionsCntByStore(storeID)) {
+		if !c.IsStorePrepared(storeID) {
 			return false
 		}
 	}

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -47,7 +47,6 @@ import (
 	"github.com/tikv/pd/pkg/progress"
 	"github.com/tikv/pd/pkg/ratelimit"
 	"github.com/tikv/pd/pkg/replication"
-	"github.com/tikv/pd/pkg/schedule"
 	sc "github.com/tikv/pd/pkg/schedule/config"
 	"github.com/tikv/pd/pkg/schedule/hbstream"
 	"github.com/tikv/pd/pkg/schedule/labeler"
@@ -1597,8 +1596,7 @@ func (c *RaftCluster) isStorePrepared() bool {
 			continue
 		}
 		storeID := store.GetID()
-		// For each store, the number of active regions should be more than total region of the store * CollectFactor
-		if float64(c.GetStoreRegionCount(storeID))*schedule.CollectFactor > float64(c.GetNotFromStorageRegionsCntByStore(storeID)) {
+		if !c.IsStorePrepared(storeID) {
 			return false
 		}
 	}

diff --git a/tests/integrations/mcs/scheduling/server_test.go b/tests/integrations/mcs/scheduling/server_test.go
@@ -522,8 +522,7 @@ func (suite *serverTestSuite) TestStoreLimit() {
 
 	stream, err := grpcPDClient.RegionHeartbeat(suite.ctx)
 	re.NoError(err)
-	// set up to 2000 to avoid the case conflicts
-	for i := uint64(2000); i <= 10; i++ {
+	for i := uint64(2); i <= 10; i++ {
 		peers := []*metapb.Peer{{Id: i, StoreId: 1}}
 		regionReq := &pdpb.RegionHeartbeatRequest{
 			Header: testutil.NewRequestHeader(suite.pdLeader.GetClusterID()),
@@ -742,4 +741,6 @@ func (suite *serverTestSuite) TestOnlineProgress() {
 	re.NotEmpty(cs)
 	re.NotEmpty(ls)
 	re.NoError(err)
+	suite.TearDownSuite()
+	suite.SetupSuite()
 }