Merge pull request #1651 from aboch/epa

Add anonymous container alias to service record on attachable network
moby · Mar 2, 2017 · 1a01921 · 1a01921
2 parents 3118f18 + f230726
commit 1a01921
Showing 1 changed file with 51 additions and 39 deletions.
diff --git a/agent.go b/agent.go
@@ -463,52 +463,64 @@ func (ep *endpoint) deleteDriverInfoFromCluster() error {
 }
 
 func (ep *endpoint) addServiceInfoToCluster() error {
+	if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface().Address() == nil {
+		return nil
+	}
+
 	n := ep.getNetwork()
 	if !n.isClusterEligible() {
 		return nil
 	}
 
 	c := n.getController()
 	agent := c.getAgent()
-	if !ep.isAnonymous() && ep.Iface().Address() != nil {
-		var ingressPorts []*PortConfig
-		if ep.svcID != "" {
-			// Gossip ingress ports only in ingress network.
-			if n.ingress {
-				ingressPorts = ep.ingressPorts
-			}
 
-			if err := c.addServiceBinding(ep.svcName, ep.svcID, n.ID(), ep.ID(), ep.virtualIP, ingressPorts, ep.svcAliases, ep.Iface().Address().IP); err != nil {
-				return err
-			}
+	var ingressPorts []*PortConfig
+	if ep.svcID != "" {
+		// Gossip ingress ports only in ingress network.
+		if n.ingress {
+			ingressPorts = ep.ingressPorts
 		}
 
-		buf, err := proto.Marshal(&EndpointRecord{
-			Name:         ep.Name(),
-			ServiceName:  ep.svcName,
-			ServiceID:    ep.svcID,
-			VirtualIP:    ep.virtualIP.String(),
-			IngressPorts: ingressPorts,
-			Aliases:      ep.svcAliases,
-			TaskAliases:  ep.myAliases,
-			EndpointIP:   ep.Iface().Address().IP.String(),
-		})
-
-		if err != nil {
+		if err := c.addServiceBinding(ep.svcName, ep.svcID, n.ID(), ep.ID(), ep.virtualIP, ingressPorts, ep.svcAliases, ep.Iface().Address().IP); err != nil {
 			return err
 		}
+	}
 
-		if agent != nil {
-			if err := agent.networkDB.CreateEntry("endpoint_table", n.ID(), ep.ID(), buf); err != nil {
-				return err
-			}
+	name := ep.Name()
+	if ep.isAnonymous() {
+		name = ep.MyAliases()[0]
+	}
+
+	buf, err := proto.Marshal(&EndpointRecord{
+		Name:         name,
+		ServiceName:  ep.svcName,
+		ServiceID:    ep.svcID,
+		VirtualIP:    ep.virtualIP.String(),
+		IngressPorts: ingressPorts,
+		Aliases:      ep.svcAliases,
+		TaskAliases:  ep.myAliases,
+		EndpointIP:   ep.Iface().Address().IP.String(),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	if agent != nil {
+		if err := agent.networkDB.CreateEntry("endpoint_table", n.ID(), ep.ID(), buf); err != nil {
+			return err
 		}
 	}
 
 	return nil
 }
 
 func (ep *endpoint) deleteServiceInfoFromCluster() error {
+	if ep.isAnonymous() && len(ep.myAliases) == 0 {
+		return nil
+	}
+
 	n := ep.getNetwork()
 	if !n.isClusterEligible() {
 		return nil
@@ -517,23 +529,23 @@ func (ep *endpoint) deleteServiceInfoFromCluster() error {
 	c := n.getController()
 	agent := c.getAgent()
 
-	if !ep.isAnonymous() {
-		if ep.svcID != "" && ep.Iface().Address() != nil {
-			var ingressPorts []*PortConfig
-			if n.ingress {
-				ingressPorts = ep.ingressPorts
-			}
+	if ep.svcID != "" && ep.Iface().Address() != nil {
+		var ingressPorts []*PortConfig
+		if n.ingress {
+			ingressPorts = ep.ingressPorts
+		}
 
-			if err := c.rmServiceBinding(ep.svcName, ep.svcID, n.ID(), ep.ID(), ep.virtualIP, ingressPorts, ep.svcAliases, ep.Iface().Address().IP); err != nil {
-				return err
-			}
+		if err := c.rmServiceBinding(ep.svcName, ep.svcID, n.ID(), ep.ID(), ep.virtualIP, ingressPorts, ep.svcAliases, ep.Iface().Address().IP); err != nil {
+			return err
 		}
-		if agent != nil {
-			if err := agent.networkDB.DeleteEntry("endpoint_table", n.ID(), ep.ID()); err != nil {
-				return err
-			}
+	}
+
+	if agent != nil {
+		if err := agent.networkDB.DeleteEntry("endpoint_table", n.ID(), ep.ID()); err != nil {
+			return err
 		}
 	}
+
 	return nil
 }