server, tidb-server: kill auto analyze when gracefully shutting down (#…

…40284) (#40302)

close #40038

server/server.go

@@ -721,6 +721,17 @@ func killConn(conn *clientConn) {
 	}
 }
 
+// KillSysProcesses kill sys processes such as auto analyze.
+func (s *Server) KillSysProcesses() {
+	if s.dom == nil {
+		return
+	}
+	sysProcTracker := s.dom.SysProcTracker()
+	for connID := range sysProcTracker.GetSysProcessList() {
+		sysProcTracker.KillSysProcess(connID)
+	}
+}
+
 // KillAllConnections kills all connections when server is not gracefully shutdown.
 func (s *Server) KillAllConnections() {
 	logutil.BgLogger().Info("[server] kill all connections.")
@@ -735,12 +746,7 @@ func (s *Server) KillAllConnections() {
 		killConn(conn)
 	}
 
-	if s.dom != nil {
-		sysProcTracker := s.dom.SysProcTracker()
-		for connID := range sysProcTracker.GetSysProcessList() {
-			sysProcTracker.KillSysProcess(connID)
-		}
-	}
+	s.KillSysProcesses()
 }
 
 var gracefulCloseConnectionsTimeout = 15 * time.Second

tidb-server/main.go

@@ -775,6 +775,9 @@ func cleanup(svr *server.Server, storage kv.Storage, dom *domain.Domain, gracefu
 	if graceful {
 		done := make(chan struct{})
 		svr.GracefulDown(context.Background(), done)
+		// Kill sys processes such as auto analyze. Otherwise, tidb-server cannot exit until auto analyze is finished.
+		// See https://github.com/pingcap/tidb/issues/40038 for details.
+		svr.KillSysProcesses()
 	} else {
 		svr.TryGracefulDown()
 	}