From e721d28ce62f52eafb6e08118058932cd00145f4 Mon Sep 17 00:00:00 2001
From: Jack Yu <yusp@pingcap.com>
Date: Thu, 12 Mar 2020 16:25:32 +0800
Subject: [PATCH] server: stop the server when writing binlog failed (#15324)

 Conflicts:
	server/server.go
---
 metrics/server.go |  4 +---
 server/conn.go    |  7 +------
 server/server.go  | 30 +-----------------------------
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/metrics/server.go b/metrics/server.go
index 2afef322b309e..a232c99cf86cb 100644
--- a/metrics/server.go
+++ b/metrics/server.go
@@ -79,9 +79,7 @@ var (
 	EventStart        = "start"
 	EventGracefulDown = "graceful_shutdown"
 	// Eventkill occurs when the server.Kill() function is called.
-	EventKill = "kill"
-	// EventHang occurs when server meet some critical error. It will close the listening port and hang for ever.
-	EventHang          = "hang"
+	EventKill          = "kill"
 	EventClose         = "close"
 	ServerEventCounter = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
diff --git a/server/conn.go b/server/conn.go
index b15155798e2af..75ddf5285f65b 100644
--- a/server/conn.go
+++ b/server/conn.go
@@ -676,13 +676,8 @@ func (cc *clientConn) Run(ctx context.Context) {
 				logutil.Logger(ctx).Error("result undetermined, close this connection", zap.Error(err))
 				return
 			} else if terror.ErrCritical.Equal(err) {
-				logutil.Logger(ctx).Error("critical error, stop the server listener", zap.Error(err))
 				metrics.CriticalErrorCounter.Add(1)
-				select {
-				case cc.server.stopListenerCh <- struct{}{}:
-				default:
-				}
-				return
+				logutil.Logger(ctx).Fatal("critical error, stop the server", zap.Error(err))
 			}
 			logutil.Logger(ctx).Warn("dispatch error",
 				zap.String("connInfo", cc.String()),
diff --git a/server/server.go b/server/server.go
index 8d4d8c314601e..7de7498710afb 100644
--- a/server/server.go
+++ b/server/server.go
@@ -111,12 +111,7 @@ type Server struct {
 	concurrentLimiter *TokenLimiter
 	clients           map[uint32]*clientConn
 	capability        uint32
-
-	// stopListenerCh is used when a critical error occurred, we don't want to exit the process, because there may be
-	// a supervisor automatically restart it, then new client connection will be created, but we can't server it.
-	// So we just stop the listener and store to force clients to chose other TiDB servers.
-	stopListenerCh chan struct{}
-	statusServer   *http.Server
+	statusServer      *http.Server
 }
 
 // ConnectionCount gets current connection count.
@@ -200,7 +195,6 @@ func NewServer(cfg *config.Config, driver IDriver) (*Server, error) {
 		driver:            driver,
 		concurrentLimiter: NewTokenLimiter(cfg.TokenLimit),
 		clients:           make(map[uint32]*clientConn),
-		stopListenerCh:    make(chan struct{}, 1),
 	}
 
 	tlsConfig, err := util.LoadTLSCertificates(s.cfg.Security.SSLCA, s.cfg.Security.SSLKey, s.cfg.Security.SSLCert)
@@ -291,11 +285,6 @@ func (s *Server) Run() error {
 			logutil.Logger(context.Background()).Error("accept failed", zap.Error(err))
 			return errors.Trace(err)
 		}
-		if s.shouldStopListener() {
-			err = conn.Close()
-			terror.Log(errors.Trace(err))
-			break
-		}
 
 		clientConn := s.newConn(conn)
 
@@ -323,23 +312,6 @@ func (s *Server) Run() error {
 
 		go s.onConn(clientConn)
 	}
-	err := s.listener.Close()
-	terror.Log(errors.Trace(err))
-	s.listener = nil
-	for {
-		metrics.ServerEventCounter.WithLabelValues(metrics.EventHang).Inc()
-		logutil.Logger(context.Background()).Error("listener stopped, waiting for manual kill.")
-		time.Sleep(time.Minute)
-	}
-}
-
-func (s *Server) shouldStopListener() bool {
-	select {
-	case <-s.stopListenerCh:
-		return true
-	default:
-		return false
-	}
 }
 
 // Close closes the server.