diff options
7 files changed, 9 insertions, 25 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java index 663bb58cacc..f61998aba4c 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java @@ -55,8 +55,6 @@ public interface Docker { List<Container> getAllContainersManagedBy(String manager); - Optional<Container> getContainer(String hostname); - Optional<Container> getContainer(ContainerName containerName); CompletableFuture<DockerImage> pullImageAsync(DockerImage image); diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 1ac5f62b130..c331a6dcd5c 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -341,18 +341,12 @@ public class DockerImpl implements Docker { } @Override - public Optional<Container> getContainer(String hostname) { - return listAllContainers().stream() - .flatMap(this::asContainer) - .filter(c -> Objects.equals(hostname, c.hostname)) - .findFirst(); - } - - @Override public Optional<Container> getContainer(ContainerName containerName) { return listAllContainers().stream() + .filter(container -> Arrays.stream(container.getNames()) + .map(this::decode) + .anyMatch(name -> name.equals(containerName.asString()))) .flatMap(this::asContainer) - .filter(c -> Objects.equals(containerName, c.name)) .findFirst(); } diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java index 2aac1cff676..2c28eac5e4f 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java @@ -91,23 +91,23 @@ public class DockerTest { final String containerHostname = "hostName1"; docker.createContainerCommand(dockerImage, containerName, containerHostname).withManagedBy(MANAGER_NAME).create(); - Optional<Container> container = docker.getContainer(containerHostname); + Optional<Container> container = docker.getContainer(containerName); assertTrue(container.isPresent()); assertEquals(container.get().state, Container.State.CREATED); docker.startContainer(containerName); - container = docker.getContainer(containerHostname); + container = docker.getContainer(containerName); assertTrue(container.isPresent()); assertEquals(container.get().state, Container.State.RUNNING); docker.dockerClient.pauseContainerCmd(containerName.asString()).exec(); - container = docker.getContainer(containerHostname); + container = docker.getContainer(containerName); assertTrue(container.isPresent()); assertEquals(container.get().state, Container.State.PAUSED); docker.dockerClient.unpauseContainerCmd(containerName.asString()).exec(); docker.stopContainer(containerName); - container = docker.getContainer(containerHostname); + container = docker.getContainer(containerName); assertTrue(container.isPresent()); assertEquals(container.get().state, Container.State.EXITED); diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java index f3f8b04f5da..250baddd7f6 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java @@ -195,7 +195,7 @@ public class RunSystemTests { private void startSystemTestNodeIfNeeded(ContainerName containerName) throws IOException, InterruptedException, ExecutionException { buildVespaSystestDockerImage(docker, vespaBaseImage); - Optional<Container> container = docker.getContainer(containerName.asString()); + Optional<Container> container = docker.getContainer(containerName); if (container.isPresent()) { if (container.get().state.isRunning()) return; else docker.deleteContainer(containerName); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index 856bf4338d4..1dd8381b7c4 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -55,7 +55,7 @@ public class LocalZoneUtils { private static final Path PROJECT_ROOT = Paths.get("").toAbsolutePath(); public static void startConfigServerIfNeeded(Docker docker, Environment environment) throws UnknownHostException { - Optional<Container> container = docker.getContainer(CONFIG_SERVER_HOSTNAME); + Optional<Container> container = docker.getContainer(CONFIG_SERVER_CONTAINER_NAME); if (container.isPresent()) { if (container.get().state.isRunning()) return; else docker.deleteContainer(CONFIG_SERVER_CONTAINER_NAME); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java index c371b7fe66c..6cc681bdf5f 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java @@ -19,7 +19,6 @@ import java.net.URL; import java.net.UnknownHostException; import java.nio.file.Path; import java.time.Duration; -import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.logging.Logger; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index 75c25b3b93e..8c7eda50a24 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -97,13 +97,6 @@ public class DockerMock implements Docker { } @Override - public Optional<Container> getContainer(String hostname) { - synchronized (monitor) { - return containers.stream().filter(container -> container.hostname.equals(hostname)).findFirst(); - } - } - - @Override public Optional<Container> getContainer(ContainerName containerName) { synchronized (monitor) { return containers.stream().filter(container -> container.name.equals(containerName)).findFirst(); |