fix tests

Signed-off-by: Ryan Leung <[email protected]>

pkg/utils/apiutil/serverapi/middleware.go

@@ -117,9 +117,6 @@ func (h *redirector) matchMicroServiceRedirectRules(r *http.Request) (bool, stri
 	r.URL.Path = strings.TrimRight(r.URL.Path, "/")
 	for _, rule := range h.microserviceRedirectRules {
 		if strings.HasPrefix(r.URL.Path, rule.matchPath) && slice.Contains(rule.matchMethods, r.Method) {
-			if !h.s.IsServiceEnabled(rule.targetServiceName) {
-				continue
-			}
 			addr, ok := h.s.GetServicePrimaryAddr(r.Context(), rule.targetServiceName)
 			if !ok || addr == "" {
 				log.Warn("failed to get the service primary addr when trying to match redirect rules",

server/cluster/cluster.go

@@ -345,30 +345,29 @@ func (c *RaftCluster) runServiceCheckJob() {
 	defer logutil.LogPanic()
 	defer c.wg.Done()
 
+	var once sync.Once
+
+	checkFn := func() {
+		if c.isAPIServiceMode {
+			once.Do(c.initSchedulers)
+			c.enabledServices.Store(mcsutils.SchedulingServiceName, true)
+		} else if !c.schedulingController.running.Load() {
+			c.startSchedulingJobs()
+			c.enabledServices.Delete(mcsutils.SchedulingServiceName)
+		}
+	}
+	checkFn()
+
 	ticker := time.NewTicker(serviceCheckInterval)
-	failpoint.Inject("highFrequencyServiceCheckJob", func() {
-		ticker.Stop()
-		ticker = time.NewTicker(time.Millisecond)
-	})
 	defer ticker.Stop()
 
-	var cancel context.CancelFunc
 	for {
 		select {
 		case <-c.ctx.Done():
 			log.Info("service check job is stopped")
-			if cancel != nil {
-				cancel()
-			}
 			return
 		case <-ticker.C:
-			if c.isAPIServiceMode {
-				c.initSchedulers()
-				c.enabledServices.Store(mcsutils.SchedulingServiceName, true)
-			} else if !c.schedulingController.running.Load() {
-				c.startSchedulingJobs()
-				c.enabledServices.Delete(mcsutils.SchedulingServiceName)
-			}
+			checkFn()
 		}
 	}
 }

tests/integrations/mcs/scheduling/config_test.go

@@ -133,7 +133,6 @@ func persistConfig(re *require.Assertions, pdLeaderServer *tests.TestServer) {
 
 func (suite *configTestSuite) TestSchedulerConfigWatch() {
 	re := suite.Require()
-
 	// Make sure the config is persisted before the watcher is created.
 	persistConfig(re, suite.pdLeaderServer)
 	// Create a config watcher.

tests/pdctl/hot/hot_test.go

@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/docker/go-units"
-	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/require"
@@ -50,7 +49,6 @@ func TestHotTestSuite(t *testing.T) {
 }
 
 func (suite *hotTestSuite) TestHot() {
-	suite.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	var start time.Time
 	start = start.Add(time.Hour)
 	opts := []tests.ConfigOption{
@@ -68,7 +66,6 @@ func (suite *hotTestSuite) TestHot() {
 	env.RunTestInTwoModes(suite.checkHotWithoutHotPeer)
 	env = tests.NewSchedulingTestEnvironment(suite.T(), opts...)
 	env.RunTestInTwoModes(suite.checkHotWithStoreID)
-	suite.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 }
 
 func (suite *hotTestSuite) checkHot(cluster *tests.TestCluster) {

tests/pdctl/scheduler/scheduler_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
@@ -573,7 +572,6 @@ func TestForwardSchedulerRequest(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	cluster, err := tests.NewTestAPICluster(ctx, 1)
 	re.NoError(err)
 	re.NoError(cluster.RunInitialServers())
@@ -609,5 +607,4 @@ func TestForwardSchedulerRequest(t *testing.T) {
 	checkSchedulerWithStatusCommand("paused", []string{
 		"balance-leader-scheduler",
 	})
-	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 }

tests/server/api/operator_test.go

@@ -24,7 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/pkg/core"
@@ -53,7 +52,6 @@ func TestOperatorTestSuite(t *testing.T) {
 }
 
 func (suite *operatorTestSuite) TestOperator() {
-	suite.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	opts := []tests.ConfigOption{
 		func(conf *config.Config, serverName string) {
 			conf.Replication.MaxReplicas = 1
@@ -72,7 +70,6 @@ func (suite *operatorTestSuite) TestOperator() {
 	}
 	env = tests.NewSchedulingTestEnvironment(suite.T(), opts...)
 	env.RunTestInTwoModes(suite.checkTransferRegionWithPlacementRule)
-	suite.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 }
 
 func (suite *operatorTestSuite) checkAddRemovePeer(cluster *tests.TestCluster) {

tests/server/cluster/cluster_test.go

@@ -1281,7 +1281,6 @@ func TestTransferLeaderForScheduler(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker", `return(true)`))
 	tc, err := tests.NewTestCluster(ctx, 2)
 	defer tc.Destroy()
@@ -1364,7 +1363,6 @@ func TestTransferLeaderForScheduler(t *testing.T) {
 	checkEvictLeaderSchedulerExist(re, schedulersController, true)
 	checkEvictLeaderStoreIDs(re, schedulersController, []uint64{1, 2})
 
-	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker"))
 }
 

tests/server/region_syncer/region_syncer_test.go

@@ -202,7 +202,6 @@ func TestPrepareChecker(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker", `return(true)`))
 	cluster, err := tests.NewTestCluster(ctx, 1, func(conf *config.Config, serverName string) { conf.PDServerCfg.UseRegionStorage = true })
 	defer cluster.Destroy()
@@ -244,7 +243,6 @@ func TestPrepareChecker(t *testing.T) {
 	}
 	time.Sleep(time.Second)
 	re.True(rc.IsPrepared())
-	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker"))
 }
 
@@ -253,7 +251,6 @@ func TestPrepareCheckerWithTransferLeader(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker", `return(true)`))
 	cluster, err := tests.NewTestCluster(ctx, 1, func(conf *config.Config, serverName string) { conf.PDServerCfg.UseRegionStorage = true })
 	defer cluster.Destroy()
@@ -292,7 +289,6 @@ func TestPrepareCheckerWithTransferLeader(t *testing.T) {
 	re.NoError(err)
 	re.Equal("pd1", cluster.WaitLeader())
 	re.True(rc.IsPrepared())
-	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyServiceCheckJob"))
 	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/changeCoordinatorTicker"))
 }