cp #7385 and #7402 to make test stable

Signed-off-by: husharp <[email protected]>
tikv · Feb 2, 2024 · cbb75bd · cbb75bd
1 parent fa0213c
commit cbb75bd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/pkg/member/member.go b/pkg/member/member.go
@@ -181,6 +181,9 @@ func (m *EmbeddedEtcdMember) GetLastLeaderUpdatedTime() time.Time {
 // and make it become a PD leader.
 // leader should be changed when campaign leader frequently.
 func (m *EmbeddedEtcdMember) CampaignLeader(ctx context.Context, leaseTimeout int64) error {
+	failpoint.Inject("skipCampaignLeaderCheck", func() {
+		failpoint.Return(m.leadership.Campaign(leaseTimeout, m.MemberValue()))
+	})
 	if m.leadership.GetCampaignTimesNum() >= campaignLeaderFrequencyTimes {
 		log.Warn("campaign times is too frequent, resign and campaign again",
 			zap.String("leader-name", m.Name()), zap.String("leader-key", m.GetLeaderPath()))

diff --git a/tests/integrations/client/client_test.go b/tests/integrations/client/client_test.go
@@ -158,6 +158,10 @@ func TestLeaderTransfer(t *testing.T) {
 	cluster, err := tests.NewTestCluster(ctx, 2)
 	re.NoError(err)
 	defer cluster.Destroy()
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck", "return(true)"))
+	defer func() {
+		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck"))
+	}()
 
 	endpoints := runServer(re, cluster)
 	cli := setupCli(re, ctx, endpoints)

diff --git a/tests/integrations/mcs/resourcemanager/resource_manager_test.go b/tests/integrations/mcs/resourcemanager/resource_manager_test.go
@@ -63,6 +63,7 @@ func (suite *resourceManagerClientTestSuite) SetupSuite() {
 	re := suite.Require()
 
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/mcs/resourcemanager/server/enableDegradedMode", `return(true)`))
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck", "return(true)"))
 
 	suite.ctx, suite.clean = context.WithCancel(context.Background())
 
@@ -148,6 +149,7 @@ func (suite *resourceManagerClientTestSuite) TearDownSuite() {
 	suite.cluster.Destroy()
 	suite.clean()
 	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/mcs/resourcemanager/server/enableDegradedMode"))
+	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck"))
 }
 
 func (suite *resourceManagerClientTestSuite) TearDownTest() {

diff --git a/tests/integrations/mcs/tso/server_test.go b/tests/integrations/mcs/tso/server_test.go
@@ -368,6 +368,11 @@ func (suite *APIServerForwardTestSuite) TestResignTSOPrimaryForward() {
 	defer tc.Destroy()
 	tc.WaitForDefaultPrimaryServing(re)
 
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck", "return(true)"))
+	defer func() {
+		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck"))
+	}()
+
 	for j := 0; j < 10; j++ {
 		tc.ResignPrimary(utils.DefaultKeyspaceID, utils.DefaultKeyspaceGroupID)
 		tc.WaitForDefaultPrimaryServing(re)

diff --git a/tests/integrations/tso/client_test.go b/tests/integrations/tso/client_test.go
@@ -300,6 +300,10 @@ func (suite *tsoClientTestSuite) TestUpdateAfterResetTSO() {
 	re := suite.Require()
 	ctx, cancel := context.WithCancel(suite.ctx)
 	defer cancel()
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck", "return(true)"))
+	defer func() {
+		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck"))
+	}()
 
 	for i := 0; i < len(suite.clients); i++ {
 		client := suite.clients[i]
@@ -336,6 +340,11 @@ func (suite *tsoClientTestSuite) TestUpdateAfterResetTSO() {
 func (suite *tsoClientTestSuite) TestRandomResignLeader() {
 	re := suite.Require()
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/tso/fastUpdatePhysicalInterval", "return(true)"))
+	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck", "return(true)"))
+	defer func() {
+		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/tso/fastUpdatePhysicalInterval"))
+		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/member/skipCampaignLeaderCheck"))
+	}()
 
 	parallelAct := func() {
 		// After https://github.com/tikv/pd/issues/6376 is fixed, we can use a smaller number here.
@@ -373,7 +382,6 @@ func (suite *tsoClientTestSuite) TestRandomResignLeader() {
 	}
 
 	mcs.CheckMultiKeyspacesTSO(suite.ctx, re, suite.clients, parallelAct)
-	re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/tso/fastUpdatePhysicalInterval"))
 }
 
 func (suite *tsoClientTestSuite) TestRandomShutdown() {