From 24394612f53c5a3a3abc20958856b12b7285adb7 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Wed, 7 Oct 2015 13:07:57 -0700 Subject: [PATCH] cluster: Don't lock the scheduler when removing a container. Signed-off-by: Andrea Luzzardi --- cluster/swarm/cluster.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go index 498a80a4ca..7441ce0d86 100644 --- a/cluster/swarm/cluster.go +++ b/cluster/swarm/cluster.go @@ -164,14 +164,9 @@ func (c *Cluster) createContainer(config *cluster.ContainerConfig, name string, return container, err } -// RemoveContainer aka Remove a container from the cluster. Containers should -// always be destroyed through the scheduler to guarantee atomicity. +// RemoveContainer aka Remove a container from the cluster. func (c *Cluster) RemoveContainer(container *cluster.Container, force, volumes bool) error { - c.scheduler.Lock() - defer c.scheduler.Unlock() - - err := container.Engine.RemoveContainer(container, force, volumes) - return err + return container.Engine.RemoveContainer(container, force, volumes) } func (c *Cluster) getEngineByAddr(addr string) *cluster.Engine {