Merge branch 'release-5.1' into cherry-pick-4347-to-release-5.1

tikv · Nov 30, 2021 · 6f9c086 · 6f9c086
2 parents 040b206 + dcfbff7
commit 6f9c086
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -359,8 +359,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
@@ -775,6 +775,12 @@ func (s *scheduleController) Stop() {
 
 func (s *scheduleController) Schedule() []*operator.Operator {
 	for i := 0; i < maxScheduleRetries; i++ {
+		// no need to retry if schedule should stop to speed exit
+		select {
+		case <-s.ctx.Done():
+			return nil
+		default:
+		}
 		// If we have schedule, reset interval to the minimal interval.
 		if op := s.Scheduler.Schedule(s.cluster); op != nil {
 			s.nextInterval = s.Scheduler.GetMinInterval()