Cancel context before replacing it

elastic · Sep 16, 2024 · f2718c3 · f2718c3
1 parent 8794c22
commit f2718c3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libbeat/esleg/eslegclient/connection.go b/libbeat/esleg/eslegclient/connection.go
@@ -288,6 +288,10 @@ func (conn *Connection) Connect() error {
 		conn.log = logp.NewLogger("esclientleg")
 	}
 
+	// Cancel the old context before replacing it. Because this Connection
+	// is not goroutine safe, there should be no in-flight request using
+	// this context, hence it's safe to cancel it.
+	conn.cancelReqs()
 	conn.reqsContext, conn.cancelReqs = context.WithCancel(context.Background())
 
 	if err := conn.getVersion(); err != nil {