diff options
2 files changed, 7 insertions, 6 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index f6cfbe938c0..4c663581ef9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -281,9 +281,10 @@ public class DockerOperationsImpl implements DockerOperations { @Override public void executeCommandInNetworkNamespace(ContainerName containerName, String[] command) { final PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, containerName); - final Integer containerPid = getContainer(containerName.asString()) + final Integer containerPid = docker.getContainer(containerName) .flatMap(container -> container.pid) - .orElseThrow(() -> new RuntimeException("PID not found for container: " + containerName.asString())); + .orElseThrow(() -> new RuntimeException("PID not found for container with name: " + + containerName.asString())); final List<String> wrappedCommand = new LinkedList<>(); wrappedCommand.add("sudo"); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java index 507fd218ba7..9ab24f667d1 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java @@ -123,10 +123,10 @@ public class DockerOperationsImplTest { "-nvL"), capturedArgs); } - private Container makeContainer(String hostname, int pid) { - final Container container = new Container(hostname, new DockerImage("mock"), - new ContainerName(hostname), true, Optional.of(pid)); - when(dockerOperations.getContainer(eq(hostname))).thenReturn(Optional.of(container)); + private Container makeContainer(String name, int pid) { + final Container container = new Container(name + ".fqdn", new DockerImage("mock"), + new ContainerName(name), true, Optional.of(pid)); + when(docker.getContainer(eq(container.name))).thenReturn(Optional.of(container)); return container; } } |