Explorar o código

Merge pull request #19226 from coolljt0725/remove_dup_check

Remove duplication checking for the existence of endpoint to speed up container starting
Tibor Vass %!s(int64=9) %!d(string=hai) anos
pai
achega
f292e90b8d
Modificáronse 1 ficheiros con 1 adicións e 10 borrados
  1. 1 10
      daemon/container_operations_unix.go

+ 1 - 10
daemon/container_operations_unix.go

@@ -771,22 +771,13 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
 		container.NetworkSettings.Networks[n.Name()] = endpointConfig
 		container.NetworkSettings.Networks[n.Name()] = endpointConfig
 	}
 	}
 
 
-	ep, err := container.GetEndpointInNetwork(n)
-	if err == nil {
-		return fmt.Errorf("Conflict. A container with name %q is already connected to network %s.", strings.TrimPrefix(container.Name, "/"), idOrName)
-	}
-
-	if _, ok := err.(libnetwork.ErrNoSuchEndpoint); !ok {
-		return err
-	}
-
 	createOptions, err := container.BuildCreateEndpointOptions(n)
 	createOptions, err := container.BuildCreateEndpointOptions(n)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
 
 
 	endpointName := strings.TrimPrefix(container.Name, "/")
 	endpointName := strings.TrimPrefix(container.Name, "/")
-	ep, err = n.CreateEndpoint(endpointName, createOptions...)
+	ep, err := n.CreateEndpoint(endpointName, createOptions...)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}