From 9a0e0cccfe3b06dacf2b3dbbb0db2030c3c7cc21 Mon Sep 17 00:00:00 2001
From: Madhu Venugopal <madhu@docker.com>
Date: Tue, 12 Jul 2016 11:27:58 -0700
Subject: [PATCH] Fixing a stale endpoint issue that blocks ingress network
 cleanup

fixes #24400

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit a4926a4d92eb7940d079de01d7fafe43060fcd56)
Signed-off-by: Tibor Vass <tibor@docker.com>
---
 daemon/network.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/daemon/network.go b/daemon/network.go
index a9944e637c..f852c6b43a 100644
--- a/daemon/network.go
+++ b/daemon/network.go
@@ -127,6 +127,14 @@ func (daemon *Daemon) SetupIngress(create clustertypes.NetworkCreateRequest, nod
 				return
 			}
 
+			// Cleanup any stale endpoints that might be left over during previous iterations
+			epList := n.Endpoints()
+			for _, ep := range epList {
+				if err := ep.Delete(true); err != nil {
+					logrus.Errorf("Failed to delete endpoint %s (%s): %v", ep.Name(), ep.ID(), err)
+				}
+			}
+
 			if err := n.Delete(); err != nil {
 				logrus.Errorf("Failed to delete stale ingress network %s: %v", n.ID(), err)
 				return