Merge pull request #50115 from corhere/libn/fix-47859-networkdb-clusterleave-leak

vvoland · web-flow · commit c430c9c7f215 · 2025-06-12T11:49:00.000Z
libnetwork/networkdb: always shut down memberlist
diff --git a/libnetwork/networkdb/cluster.go b/libnetwork/networkdb/cluster.go
@@ -224,11 +224,11 @@ func (nDB *NetworkDB) clusterLeave() error {
 	mlist := nDB.memberlist
 
 	if err := nDB.sendNodeEvent(NodeEventTypeLeave); err != nil {
-		log.G(context.TODO()).Errorf("failed to send node leave: %v", err)
+		log.G(context.TODO()).WithError(err).Error("failed to send node leave event")
 	}
 
 	if err := mlist.Leave(time.Second); err != nil {
-		return err
+		log.G(context.TODO()).WithError(err).Error("failed to broadcast memberlist leave message")
 	}
 
 	// cancel the context

Original file line number	Diff line number	Diff line change
`@@ -224,11 +224,11 @@ func (nDB *NetworkDB) clusterLeave() error {`
`224`	`224`	`mlist := nDB.memberlist`
`225`	`225`
`226`	`226`	`if err := nDB.sendNodeEvent(NodeEventTypeLeave); err != nil {`
`227`		`- log.G(context.TODO()).Errorf("failed to send node leave: %v", err)`
	`227`	`+ log.G(context.TODO()).WithError(err).Error("failed to send node leave event")`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`if err := mlist.Leave(time.Second); err != nil {`
`231`		`- return err`
	`231`	`+ log.G(context.TODO()).WithError(err).Error("failed to broadcast memberlist leave message")`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`// cancel the context`