Browse code

Fixing a stale endpoint issue that blocks ingress network cleanup

fixes #24400

Signed-off-by: Madhu Venugopal <madhu@docker.com>

Madhu Venugopal authored on 2016/07/13 03:27:58
Showing 1 changed files
... ...
@@ -127,6 +127,14 @@ func (daemon *Daemon) SetupIngress(create clustertypes.NetworkCreateRequest, nod
127 127
 				return
128 128
 			}
129 129
 
130
+			// Cleanup any stale endpoints that might be left over during previous iterations
131
+			epList := n.Endpoints()
132
+			for _, ep := range epList {
133
+				if err := ep.Delete(true); err != nil {
134
+					logrus.Errorf("Failed to delete endpoint %s (%s): %v", ep.Name(), ep.ID(), err)
135
+				}
136
+			}
137
+
130 138
 			if err := n.Delete(); err != nil {
131 139
 				logrus.Errorf("Failed to delete stale ingress network %s: %v", n.ID(), err)
132 140
 				return