toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplication checking for the existence of endpoint

Browse Source 
CreateEndpoint will check if the endpoint exist or not, so there is no
need to check before call CreatEndpoint in connectToNetwork since
checking the existence of the endpoint could take much time especially
if we use external K-V store, this would slow down the staring of container.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: f62d4ceba66ef6b979be8f45d0acf260bea27a13
Component: engine
This commit is contained in:
Lei Jitang
2016-01-11 14:45:43 +08:00
parent 15e94930a8
commit c28220ee2a
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/container_operations_unix.go
+1 -10
View File
@@ -758,22 +758,13 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
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)
if err != nil {
return err
}
endpointName := strings.TrimPrefix(container.Name, "/")
ep, err = n.CreateEndpoint(endpointName, createOptions...)
ep, err := n.CreateEndpoint(endpointName, createOptions...)
if err != nil {
return err
}