Merge pull request #1473 from mrjana/agent

Avoid returning early on agent join failures
moby · Sep 27, 2016 · f1aa086 · f1aa086
2 parents bf3d9cc + 23a782b
commit f1aa086
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/agent.go b/agent.go
@@ -191,8 +191,7 @@ func (c *controller) agentSetup() error {
 
 	if remoteAddr != "" {
 		if err := c.agentJoin(remoteAddr); err != nil {
-			logrus.Errorf("Error in agentJoin : %v", err)
-			return nil
+			logrus.Errorf("Error in joining gossip cluster : %v(join will be retried in background)", err)
 		}
 	}
 

diff --git a/networkdb/cluster.go b/networkdb/cluster.go
@@ -161,6 +161,10 @@ func (nDB *NetworkDB) retryJoin(members []string, stop <-chan struct{}) {
 				logrus.Errorf("Failed to join memberlist %s on retry: %v", members, err)
 				continue
 			}
+			if err := nDB.sendNodeEvent(NodeEventTypeJoin); err != nil {
+				logrus.Errorf("failed to send node join on retry: %v", err)
+				continue
+			}
 			return
 		case <-stop:
 			return