fix the crash running with compose v1

Author: tifayuki

haproxy/helper/backend_helper.py

@@ -23,19 +23,23 @@ def get_backend_routes(route_health_check, is_sticky, routes, routes_added, serv
     backend_routes = []
     for _service_alias, routes in routes.iteritems():
         if not service_alias or _service_alias == service_alias:
+            address_add = []
             for route in routes:
                 # avoid adding those tcp routes adding http backends
                 if route in routes_added:
                     continue
+                address = "%s:%s" % (route["addr"], route["port"])
+                if address not in address_add:
+                    address_add.append(address)
+                    backend_route = ["server %s %s" % (route["container_name"], address)]
+                    if is_sticky:
+                        backend_route.append("cookie %s" % route["container_name"])
 
-                backend_route = ["server %s %s:%s" % (route["container_name"], route["addr"], route["port"])]
-                if is_sticky:
-                    backend_route.append("cookie %s" % route["container_name"])
+                    if route_health_check:
+                        backend_route.append(route_health_check)
 
-                if route_health_check:
-                    backend_route.append(route_health_check)
+                    backend_routes.append(" ".join(backend_route))
 
-                backend_routes.append(" ".join(backend_route))
     return sorted(backend_routes)
 
 

haproxy/parser/base_parser.py

@@ -24,12 +24,12 @@ def _merge_services_with_same_vhost(self):
             self.service_aliases.remove(service_alias)
             del self.details[service_alias]
 
-            for route in self.routes[service_alias]:
-                if services_with_same_vhost[service_alias] not in self. routes:
-                    self.routes[services_with_same_vhost[service_alias]] = [route]
-                else:
-                    self.routes[services_with_same_vhost[service_alias]].append(route)
-            del self.routes[service_alias]
+            if service_alias in self.routes:
+                for route in self.routes[service_alias]:
+                    if service_alias in services_with_same_vhost and \
+                                    services_with_same_vhost[service_alias] in self.routes:
+                        self.routes[services_with_same_vhost[service_alias]].append(route)
+                del self.routes[service_alias]
 
             vhosts = []
             for vhost in self.vhosts:

haproxy/parser/legacy_link_parser.py

@@ -66,19 +66,10 @@ def _parse_routes(details, envvars):
                     route.update({"container_name": container_name})
                     exclude_ports = details.get(service_alias, {}).get("exclude_ports")
                     if not exclude_ports or (exclude_ports and route["port"] not in exclude_ports):
-                        route_added = False
-                        for _, rs in routes.iteritems():
-                            for r in rs:
-                                if route['proto'] == r['proto'] and \
-                                                route['port'] == r['port'] and \
-                                                route['addr'] == r['addr']:
-                                    route_added = True
-                                    break
-                        if not route_added:
-                            if service_alias in routes:
-                                routes[service_alias].append(route)
-                            else:
-                                routes[service_alias] = [route]
+                        if service_alias in routes:
+                            routes[service_alias].append(route)
+                        else:
+                            routes[service_alias] = [route]
         return routes
 
 

tests/unit/parser/test_legacy_link_parser.py

@@ -116,6 +116,7 @@ def test_parse_routes(self):
                    }
 
         routes = {'WORLD': [{'container_name': 'WORLD_1', 'proto': 'tcp', 'port': '80', 'addr': '10.7.0.3'}],
+                  'HELLO': [{'container_name': 'HELLO_1', 'proto': 'tcp', 'port': '80', 'addr': '10.7.0.1',}],
                   'DUPLICATED': [{'container_name': 'DUPLICATED', 'proto': 'tcp', 'port': '80', 'addr': '10.7.0.1'}]}
         self.assertEqual(routes, specs._parse_routes(details, envvars))