make TestAccelerateRegionsScheduleInRanges stable

Signed-off-by: Ryan Leung <[email protected]>
tikv · Sep 9, 2024 · 92ea032 · 92ea032
1 parent 98e0407
commit 92ea032
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/schedule/checker/checker_controller.go b/pkg/schedule/checker/checker_controller.go
@@ -367,6 +367,9 @@ func (c *Controller) CheckSuspectRanges() {
 		case <-c.ctx.Done():
 			return
 		case <-ticker.C:
+			failpoint.Inject("skipCheckSuspectRanges", func() {
+				failpoint.Continue()
+			})
 			keyRange, success := c.PopOneSuspectKeyRange()
 			if !success {
 				continue

diff --git a/tests/server/api/region_test.go b/tests/server/api/region_test.go
@@ -138,7 +138,10 @@ func (suite *regionTestSuite) checkSplitRegions(cluster *tests.TestCluster) {
 }
 
 func (suite *regionTestSuite) TestAccelerateRegionsScheduleInRange() {
+	re := suite.Require()
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/checker/skipCheckSuspectRanges", "return(true)"))
 	suite.env.RunTestBasedOnMode(suite.checkAccelerateRegionsScheduleInRange)
+	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/checker/skipCheckSuspectRanges"))
 }
 
 func (suite *regionTestSuite) checkAccelerateRegionsScheduleInRange(cluster *tests.TestCluster) {
@@ -173,7 +176,10 @@ func (suite *regionTestSuite) checkAccelerateRegionsScheduleInRange(cluster *tes
 }
 
 func (suite *regionTestSuite) TestAccelerateRegionsScheduleInRanges() {
+	re := suite.Require()
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/checker/skipCheckSuspectRanges", "return(true)"))
 	suite.env.RunTestBasedOnMode(suite.checkAccelerateRegionsScheduleInRanges)
+	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/checker/skipCheckSuspectRanges"))
 }
 
 func (suite *regionTestSuite) checkAccelerateRegionsScheduleInRanges(cluster *tests.TestCluster) {