fix(hatchery/swarm): improve some logs (#4303)

Hatchery swarm: avoid error log if a container is already under deletion.
ovh · May 20, 2019 · 5939697 · 5939697
1 parent b5c1357
commit 5939697
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/engine/hatchery/swarm/swarm_util_kill.go b/engine/hatchery/swarm/swarm_util_kill.go
@@ -136,8 +136,8 @@ func (h *HatcherySwarm) killAndRemoveContainer(dockerClient *dockerClient, ID st
 	defer cancelList()
 	if err := dockerClient.ContainerRemove(ctxDockerRemove, ID, types.ContainerRemoveOptions{Force: true}); err != nil {
 		// container could be already removed by a previous call to docker
-		if !strings.Contains(err.Error(), "No such container") {
-			return sdk.WrapError(err, "Unable to remove container %s form %s", ID, dockerClient.name)
+		if !strings.Contains(err.Error(), "No such container") && !strings.Contains(err.Error(), "is already in progress") {
+			return sdk.WrapError(err, "Unable to remove container %s from %s", ID, dockerClient.name)
 		}
 	}