From b65a4ee10e2d34ba41d7d3447fd42c21a26b1ebb Mon Sep 17 00:00:00 2001
From: Flavio Crisciani <flavio.crisciani@docker.com>
Date: Wed, 2 Aug 2017 14:51:37 -0700
Subject: [PATCH] Avoid peerUpdate logic in swarm mode

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
---
 libnetwork/drivers/overlay/peerdb.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
index 21cd1fbe3d..510c6138d4 100644
--- a/libnetwork/drivers/overlay/peerdb.go
+++ b/libnetwork/drivers/overlay/peerdb.go
@@ -207,6 +207,12 @@ func (d *driver) peerDbDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPM
 }
 
 func (d *driver) peerDbUpdateSandbox(nid string) {
+	// The following logic is useful only in non swarm mode
+	// In swarm mode instead the programmig will come directly from networkDB
+	if !d.isSerfAlive() {
+		return
+	}
+
 	d.peerDb.Lock()
 	pMap, ok := d.peerDb.mp[nid]
 	if !ok {