Remove string test for container conflict

client/driver/docker.go

@@ -1350,74 +1350,73 @@ CREATE:
 
 	d.logger.Printf("[DEBUG] driver.docker: failed to create container %q from image %q (ID: %q) (attempt %d): %v",
 		config.Name, d.driverConfig.ImageName, d.imageID, attempted+1, createErr)
-	if strings.Contains(strings.ToLower(createErr.Error()), "container already exists") {
-		containers, err := client.ListContainers(docker.ListContainersOptions{
-			All: true,
-		})
-		if err != nil {
-			d.logger.Printf("[ERR] driver.docker: failed to query list of containers matching name:%s", config.Name)
-			return nil, recoverableErrTimeouts(fmt.Errorf("Failed to query list of containers: %s", err))
-		}
-
-		// Delete matching containers
-		// Adding a / infront of the container name since Docker returns the
-		// container names with a / pre-pended to the Nomad generated container names
-		containerName := "/" + config.Name
-		d.logger.Printf("[DEBUG] driver.docker: searching for container name %q to purge", containerName)
-		for _, shimContainer := range containers {
-			d.logger.Printf("[DEBUG] driver.docker: listed container %+v", shimContainer.Names)
-			found := false
-			for _, name := range shimContainer.Names {
-				if name == containerName {
-					d.logger.Printf("[DEBUG] driver.docker: Found container %v: %v", containerName, shimContainer.ID)
-					found = true
-					break
-				}
-			}
+	if strings.Contains(strings.ToLower(createErr.Error()), "no such image") {
+		// There is still a very small chance this is possible even with the
+		// coordinator so retry.
+		return nil, structs.NewRecoverableError(createErr, true)
+	}
 
-			if !found {
-				continue
+	containers, err := client.ListContainers(docker.ListContainersOptions{
+		All: true,
+	})
+	if err != nil {
+		d.logger.Printf("[ERR] driver.docker: failed to query list of containers matching name:%s", config.Name)
+		return nil, recoverableErrTimeouts(fmt.Errorf("Failed to query list of containers: %s", err))
+	}
+
+	// Delete matching containers
+	// Adding a / infront of the container name since Docker returns the
+	// container names with a / pre-pended to the Nomad generated container names
+	containerName := "/" + config.Name
+	d.logger.Printf("[DEBUG] driver.docker: searching for container name %q", containerName)
+	for _, shimContainer := range containers {
+		d.logger.Printf("[DEBUG] driver.docker: listed container %+v", shimContainer.Names)
+		found := false
+		for _, name := range shimContainer.Names {
+			if name == containerName {
+				d.logger.Printf("[DEBUG] driver.docker: Found container %v: %v", containerName, shimContainer.ID)
+				found = true
+				break
 			}
+		}
 
-			// Inspect the container and if the container isn't dead then return
-			// the container
-			container, err := client.InspectContainer(shimContainer.ID)
-			if err != nil {
-				err = fmt.Errorf("Failed to inspect container %s: %s", shimContainer.ID, err)
+		if !found {
+			continue
+		}
 
-				// This error is always recoverable as it could
-				// be caused by races between listing
-				// containers and this container being removed.
-				// See #2802
-				return nil, structs.NewRecoverableError(err, true)
-			}
-			if container != nil && container.State.Running {
-				return container, nil
-			}
+		// Inspect the container and if the container isn't dead then return
+		// the container
+		container, err := client.InspectContainer(shimContainer.ID)
+		if err != nil {
+			err = fmt.Errorf("Failed to inspect container %s: %s", shimContainer.ID, err)
 
-			err = client.RemoveContainer(docker.RemoveContainerOptions{
-				ID:    container.ID,
-				Force: true,
-			})
-			if err != nil {
-				d.logger.Printf("[ERR] driver.docker: failed to purge container %s", container.ID)
-				return nil, recoverableErrTimeouts(fmt.Errorf("Failed to purge container %s: %s", container.ID, err))
-			} else if err == nil {
-				d.logger.Printf("[INFO] driver.docker: purged container %s", container.ID)
-			}
+			// This error is always recoverable as it could
+			// be caused by races between listing
+			// containers and this container being removed.
+			// See #2802
+			return nil, structs.NewRecoverableError(err, true)
+		}
+		if container != nil && container.State.Running {
+			return container, nil
 		}
 
-		if attempted < 5 {
-			attempted++
-			time.Sleep(1 * time.Second)
-			goto CREATE
+		d.logger.Printf("[INFO] driver.docker: purging container container %s", container.ID)
+		err = client.RemoveContainer(docker.RemoveContainerOptions{
+			ID:    container.ID,
+			Force: true,
+		})
+		if err != nil {
+			d.logger.Printf("[ERR] driver.docker: failed to purge container %s", container.ID)
+			return nil, recoverableErrTimeouts(fmt.Errorf("Failed to purge container %s: %s", container.ID, err))
 		}
-	} else if strings.Contains(strings.ToLower(createErr.Error()), "no such image") {
-		// There is still a very small chance this is possible even with the
-		// coordinator so retry.
-		return nil, structs.NewRecoverableError(createErr, true)
+		d.logger.Printf("[INFO] driver.docker: purged container %s", container.ID)
 	}
 
+	if attempted < 5 {
+		attempted++
+		time.Sleep(1 * time.Second)
+		goto CREATE
+	}
 	return nil, recoverableErrTimeouts(createErr)
 }