Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amend container shutdown to catch and log for all Exception classes #1663

Merged
merged 4 commits into from Aug 10, 2019
Merged

Amend container shutdown to catch and log for all Exception classes #1663

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04932a3
Amend container shutdown to catch and log for all Exception classes
rnorth Jul 24, 2019
bbd93c7
Merge branch 'master' into prevent-teardown-rethrow
rnorth Jul 24, 2019
c165321
Log root cause exception message rather than immediate exception's me…
rnorth Jul 25, 2019
6bd5c20
Merge branch 'master' into prevent-teardown-rethrow
rnorth Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 7 additions & 20 deletions core/src/main/java/org/testcontainers/utility/ResourceReaper.java
View file
Open in desktop
Expand Up @@ -2,9 +2,6 @@

import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.exception.ConflictException;
import com.github.dockerjava.api.exception.DockerException;
import com.github.dockerjava.api.exception.InternalServerErrorException;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.Bind;
import com.github.dockerjava.api.model.ExposedPort;
Expand Down Expand Up @@ -218,11 +215,11 @@ private void stopContainer(String containerId, String imageName) {
boolean running;
try {
InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
running = containerInfo.getState().getRunning();
running = containerInfo.getState() != null && Boolean.TRUE.equals(containerInfo.getState().getRunning());
} catch (NotFoundException e) {
LOGGER.trace("Was going to stop container but it apparently no longer exists: {}", containerId);
return;
} catch (DockerException e) {
} catch (Exception e) {
LOGGER.trace("Error encountered when checking container for shutdown (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
return;
}
Expand All @@ -232,33 +229,23 @@ private void stopContainer(String containerId, String imageName) {
LOGGER.trace("Stopping container: {}", containerId);
dockerClient.killContainerCmd(containerId).exec();
LOGGER.trace("Stopped container: {}", imageName);
} catch (ConflictException e) {
if ( e.getMessage().startsWith("Cannot kill container: ") && e.getMessage().endsWith(containerId + " is not running")) {
LOGGER.trace("Was going to kill the container but it apparently already dead : {}", e.getMessage());
} else {
throw e;
}
} catch (DockerException e) {
} catch (Exception e) {
LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
}
}

try {
dockerClient.inspectContainerCmd(containerId).exec();
} catch (NotFoundException e) {
} catch (Exception e) {
LOGGER.trace("Was going to remove container but it apparently no longer exists: {}", containerId);
return;
}

try {
LOGGER.trace("Removing container: {}", containerId);
try {
dockerClient.removeContainerCmd(containerId).withRemoveVolumes(true).withForce(true).exec();
LOGGER.debug("Removed container and associated volume(s): {}", imageName);
} catch (InternalServerErrorException e) {
LOGGER.trace("Exception when removing container with associated volume(s): {} (due to {})", imageName, e.getMessage());
}
} catch (DockerException e) {
dockerClient.removeContainerCmd(containerId).withRemoveVolumes(true).withForce(true).exec();
LOGGER.debug("Removed container and associated volume(s): {}", imageName);
} catch (Exception e) {
LOGGER.trace("Error encountered shutting down container (ID: {}) - it may not have been stopped, or may already be stopped: {}", containerId, e.getMessage());
}
}
Expand Down