Merge pull request #1463 from mavenugo/cl

mrjana · web-flow · commit 378d556a2c82 · 2016-09-23T08:35:00.000-07:00
Allow the memberlist shutdown even if networkdb leave fails
diff --git a/networkdb/cluster.go b/networkdb/cluster.go
@@ -190,7 +190,7 @@ func (nDB *NetworkDB) clusterLeave() error {
 	mlist := nDB.memberlist
 
 	if err := nDB.sendNodeEvent(NodeEventTypeLeave); err != nil {
-		return fmt.Errorf("failed to send node leave: %v", err)
+		logrus.Errorf("failed to send node leave: %v", err)
 	}
 
 	if err := mlist.Leave(time.Second); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func (nDB *NetworkDB) clusterLeave() error {`
`190`	`190`	`mlist := nDB.memberlist`
`191`	`191`
`192`	`192`	`if err := nDB.sendNodeEvent(NodeEventTypeLeave); err != nil {`
`193`		`- return fmt.Errorf("failed to send node leave: %v", err)`
	`193`	`+ logrus.Errorf("failed to send node leave: %v", err)`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if err := mlist.Leave(time.Second); err != nil {`