Close all listeners firstly, afterwards close the server

Signed-off-by: Benjamin Wang <[email protected]>

server/embed/etcd.go

@@ -411,19 +411,6 @@ func (e *Etcd) Close() {
 		close(e.stopc)
 	})
 
-	// close client requests with request timeout
-	timeout := 2 * time.Second
-	if e.Server != nil {
-		timeout = e.Server.Cfg.ReqTimeout()
-	}
-	for _, sctx := range e.sctxs {
-		for ss := range sctx.serversC {
-			ctx, cancel := context.WithTimeout(context.Background(), timeout)
-			stopServers(ctx, ss)
-			cancel()
-		}
-	}
-
 	for _, sctx := range e.sctxs {
 		sctx.cancel()
 	}
@@ -443,11 +430,6 @@ func (e *Etcd) Close() {
 		e.tracingExporterShutdown()
 	}
 
-	// close rafthttp transports
-	if e.Server != nil {
-		e.Server.Stop()
-	}
-
 	// close all idle connections in peer handler (wait up to 1-second)
 	for i := range e.Peers {
 		if e.Peers[i] != nil && e.Peers[i].close != nil {
@@ -456,6 +438,25 @@ func (e *Etcd) Close() {
 			cancel()
 		}
 	}
+
+	// close client requests with request timeout
+	timeout := 2 * time.Second
+	if e.Server != nil {
+		timeout = e.Server.Cfg.ReqTimeout()
+	}
+	for _, sctx := range e.sctxs {
+		for ss := range sctx.serversC {
+			ctx, cancel := context.WithTimeout(context.Background(), timeout)
+			stopServers(ctx, ss)
+			cancel()
+		}
+	}
+
+	// close rafthttp transports
+	if e.Server != nil {
+		e.Server.Stop()
+	}
+
 	if e.errc != nil {
 		e.wg.Wait()
 		close(e.errc)