fix race

Signed-off-by: Ryan Leung <[email protected]>
tikv · Nov 7, 2023 · 2d6d331 · 2d6d331
1 parent be68446
commit 2d6d331
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/schedule/coordinator.go b/pkg/schedule/coordinator.go
@@ -372,6 +372,9 @@ func (c *Coordinator) RunUntilStop() {
 	c.Run()
 	<-c.ctx.Done()
 	log.Info("coordinator is stopping")
+	c.GetSchedulersController().Wait()
+	c.wg.Wait()
+	log.Info("coordinator has been stopped")
 }
 
 // Run starts coordinator.
@@ -576,9 +579,6 @@ func (c *Coordinator) waitPluginUnload(pluginPath, schedulerName string, ch chan
 // Stop stops the coordinator.
 func (c *Coordinator) Stop() {
 	c.cancel()
-	c.GetSchedulersController().Wait()
-	c.wg.Wait()
-	log.Info("coordinator has been stopped")
 }
 
 // GetHotRegionsByType gets hot regions' statistics by RWType.

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -716,7 +716,7 @@ func (c *RaftCluster) Stop() {
 		return
 	}
 	c.running = false
-	if !c.IsServiceEnabled(mcsutils.SchedulingServiceName) {
+	if !c.IsServiceEnabled(mcsutils.SchedulingServiceName) && c.schedulingController.running.Load() {
 		c.stopSchedulingJobs()
 	}
 	c.cancel()