From 727b91734d66a4cb4b9895c18f0121d5311ea3e2 Mon Sep 17 00:00:00 2001
From: Jana Radhakrishnan <mrjana@docker.com>
Date: Tue, 27 Sep 2016 00:12:07 -0700
Subject: [PATCH] Avoid propogating agent join failures

When a gossip join failure happens do not propogate that up the call
chain because a join failure is most likely transient and the retry
logic built in the networkdb is going to retry and succeed. This error
propagation makes the initialization of ingress network/sandbox to abort
which causes a problem even after the gossip join on retry is successfull.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
---
 agent.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/agent.go b/agent.go
index fb0c342257..8e8ddbeb11 100644
--- a/agent.go
+++ b/agent.go
@@ -192,7 +192,6 @@ func (c *controller) agentSetup() error {
 	if remoteAddr != "" {
 		if err := c.agentJoin(remoteAddr); err != nil {
 			logrus.Errorf("Error in agentJoin : %v", err)
-			return nil
 		}
 	}