libnetwork/networkdb: always shut down memberlist

corhere · corhere · commit 16ed51d864be · 2025-05-30T13:56:47.000-04:00
Gracefully leaving the memberlist cluster is a best-effort operation.
Failing to successfully broadcast the leave message to a peer should not
prevent NetworkDB from cleaning up the memberlist instance on close. But
that was not the case in practice. Log the error returned from
(*memberlist.Memberlist).Leave instead of returning it and proceed with
shutting down irrespective of whether Leave() returns an error.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
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`