Merge pull request #2203 from k-wall/refresh-brokers-leaks-broker

fix: prevent RefreshBrokers leaking old brokers
IBM · Apr 13, 2022 · a7dab62 · a7dab62
2 parents 1776783 + 132afa5
commit a7dab62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/client.go b/client.go
@@ -459,6 +459,14 @@ func (client *client) RefreshBrokers(addrs []string) error {
 		delete(client.brokers, broker.ID())
 	}
 
+	for _, broker := range client.seedBrokers {
+		_ = broker.Close()
+	}
+
+	for _, broker := range client.deadSeeds {
+		_ = broker.Close()
+	}
+
 	client.seedBrokers = nil
 	client.deadSeeds = nil
 

diff --git a/client_test.go b/client_test.go
@@ -528,11 +528,11 @@ func TestClientRefreshBrokers(t *testing.T) {
 	initialSeed.Returns(metadataResponse1)
 
 	c, err := NewClient([]string{initialSeed.Addr()}, NewTestConfig())
-	client := c.(*client)
-
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer c.Close()
+	client := c.(*client)
 
 	if len(client.Brokers()) != 2 {
 		t.Error("Meta broker is not 2")