فهرست منبع

Merge pull request #38906 from thaJeztah/carry_38304_fix_swarm_leave_hanging

Fix for situation where swarm leave causes wait forever for agent to stop
Tibor Vass 6 سال پیش
والد
کامیت
06c9ae1327
1فایلهای تغییر یافته به همراه5 افزوده شده و 0 حذف شده
  1. 5 0
      daemon/cluster/noderunner.go

+ 5 - 0
daemon/cluster/noderunner.go

@@ -298,6 +298,11 @@ func (n *nodeRunner) Stop() error {
 		n.cancelReconnect = nil
 		n.cancelReconnect = nil
 	}
 	}
 	if n.swarmNode == nil {
 	if n.swarmNode == nil {
+		// even though the swarm node is nil we still may need
+		// to send a node leave event to perform any cleanup required.
+		if n.cluster != nil {
+			n.cluster.SendClusterEvent(lncluster.EventNodeLeave)
+		}
 		n.mu.Unlock()
 		n.mu.Unlock()
 		return nil
 		return nil
 	}
 	}