docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cluster: Don't lock the scheduler when removing a container. 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-10-07 13:07:57 -07:00
parent 91279c8256
commit 24394612f5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/swarm/cluster.go
View File

@ -164,14 +164,9 @@ func (c *Cluster) createContainer(config *cluster.ContainerConfig, name string,
return container, err return container, err
} }
// RemoveContainer aka Remove a container from the cluster. Containers should // RemoveContainer aka Remove a container from the cluster.
// always be destroyed through the scheduler to guarantee atomicity.
func (c *Cluster) RemoveContainer(container *cluster.Container, force, volumes bool) error { func (c *Cluster) RemoveContainer(container *cluster.Container, force, volumes bool) error {
c.scheduler.Lock() return container.Engine.RemoveContainer(container, force, volumes)
defer c.scheduler.Unlock()
err := container.Engine.RemoveContainer(container, force, volumes)
return err
} }
func (c *Cluster) getEngineByAddr(addr string) *cluster.Engine { func (c *Cluster) getEngineByAddr(addr string) *cluster.Engine {