From 9c012a71e01ae03142f8e818e70fa24b61e4b5be Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Tue, 17 Jan 2017 16:23:29 -0800 Subject: [PATCH] Remove outdated comment --- client/driver/docker.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index 5d98ca963..2932e2647 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -510,11 +510,12 @@ func (d *DockerDriver) Cleanup(_ *ExecContext, res *CreatedResources) error { for _, value := range resources { if err := d.cleanupImage(value); err != nil { if structs.IsRecoverable(err) { - // This will be retried so put it back into the map - res.Add(key, value) retry = true } merr.Errors = append(merr.Errors, err) + + // Re-add all failures to the map + res.Add(key, value) } } default: @@ -945,8 +946,6 @@ func (d *DockerDriver) Periodic() (bool, time.Duration) { // createImage creates a docker image either by pulling it from a registry or by // loading it from the file system -// -// Returns true if an image was downloaded and should be cleaned up. func (d *DockerDriver) createImage(driverConfig *DockerDriverConfig, client *docker.Client, taskDir *allocdir.TaskDir) error { image := driverConfig.ImageName repo, tag := docker.ParseRepositoryTag(image)