speed schedule exit

Signed-off-by: bufferflies <1045931706@qq.com>
tikv · Sep 26, 2021 · 1ee33b4 · 1ee33b4
1 parent cf1f2a0
commit 1ee33b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -391,8 +391,8 @@ func (c *RaftCluster) Stop() {
 	}
 
 	c.running = false
-	close(c.quit)
 	c.coordinator.stop()
+	close(c.quit)
 	c.Unlock()
 	c.wg.Wait()
 	log.Info("raftcluster is stopped")

diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go
@@ -849,6 +849,11 @@ func (s *scheduleController) Stop() {
 
 func (s *scheduleController) Schedule() []*operator.Operator {
 	for i := 0; i < maxScheduleRetries; i++ {
+		select {
+		case <-s.ctx.Done():
+			return nil
+		default:
+		}
 		cacheCluster := opt.NewCacheCluster(s.cluster)
 		// If we have schedule, reset interval to the minimal interval.
 		if op := s.Scheduler.Schedule(cacheCluster); op != nil {