close client and metrics listeners firstly when shutting down etcd

Signed-off-by: Benjamin Wang <[email protected]>
etcd-io · Jan 19, 2025 · 86ce681 · 86ce681
1 parent c9e85fd
commit 86ce681
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/server/embed/etcd.go b/server/embed/etcd.go
@@ -411,6 +411,16 @@ func (e *Etcd) Close() {
 		close(e.stopc)
 	})
 
+	for i := range e.Clients {
+		if e.Clients[i] != nil {
+			e.Clients[i].Close()
+		}
+	}
+
+	for i := range e.metricsListeners {
+		e.metricsListeners[i].Close()
+	}
+
 	// close client requests with request timeout
 	timeout := 2 * time.Second
 	if e.Server != nil {
@@ -428,16 +438,6 @@ func (e *Etcd) Close() {
 		sctx.cancel()
 	}
 
-	for i := range e.Clients {
-		if e.Clients[i] != nil {
-			e.Clients[i].Close()
-		}
-	}
-
-	for i := range e.metricsListeners {
-		e.metricsListeners[i].Close()
-	}
-
 	// shutdown tracing exporter
 	if e.tracingExporterShutdown != nil {
 		e.tracingExporterShutdown()