fix the test

Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx · Nov 21, 2023 · cabf1b8 · cabf1b8
1 parent 09360e5
commit cabf1b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -654,7 +654,7 @@ func (c *RaftCluster) runMetricsCollectionJob() {
 	ticker := time.NewTicker(metricsCollectionJobInterval)
 	failpoint.Inject("highFrequencyClusterJobs", func() {
 		ticker.Stop()
-		ticker = time.NewTicker(time.Microsecond)
+		ticker = time.NewTicker(time.Millisecond)
 	})
 	defer ticker.Stop()
 
@@ -734,10 +734,10 @@ func (c *RaftCluster) Stop() {
 		return
 	}
 	c.running = false
+	c.cancel()
 	if !c.IsServiceIndependent(mcsutils.SchedulingServiceName) {
 		c.stopSchedulingJobs()
 	}
-	c.cancel()
 	c.Unlock()
 
 	c.wg.Wait()

diff --git a/server/cluster/scheduling_controller.go b/server/cluster/scheduling_controller.go
@@ -117,11 +117,6 @@ func (sc *schedulingController) initCoordinatorLocked(ctx context.Context, clust
 func (sc *schedulingController) runCoordinator() {
 	defer logutil.LogPanic()
 	defer sc.wg.Done()
-	select {
-	case <-sc.ctx.Done():
-		return
-	default:
-	}
 	sc.coordinator.RunUntilStop()
 }
 
@@ -154,7 +149,7 @@ func (sc *schedulingController) runSchedulingMetricsCollectionJob() {
 	ticker := time.NewTicker(metricsCollectionJobInterval)
 	failpoint.Inject("highFrequencyClusterJobs", func() {
 		ticker.Stop()
-		ticker = time.NewTicker(time.Microsecond)
+		ticker = time.NewTicker(time.Millisecond)
 	})
 	defer ticker.Stop()
 

diff --git a/tests/server/cluster/cluster_test.go b/tests/server/cluster/cluster_test.go
@@ -518,8 +518,6 @@ func TestRaftClusterMultipleRestart(t *testing.T) {
 		err = rc.Start(leaderServer.GetServer())
 		re.NoError(err)
 		time.Sleep(time.Millisecond)
-		rc = leaderServer.GetRaftCluster()
-		re.NotNil(rc)
 		rc.Stop()
 	}
 	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs"))