Merge pull request #1643 from yahoo/freva/docker-always-returns-pid

Docker always returns pid

9 files changed, 40 insertions, 37 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 4c663581ef9..971fe235f70 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
@@ -253,7 +253,7 @@ public class DockerOperationsImpl implements DockerOperations {
     public void removeContainer(final ContainerNodeSpec nodeSpec, final Container existingContainer) {
         PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, nodeSpec.containerName);
         final ContainerName containerName = existingContainer.name;
-        if (existingContainer.isRunning) {
+        if (existingContainer.state.isRunning()) {
             logger.info("Stopping container " + containerName);
             docker.stopContainer(containerName);
         }
@@ -282,7 +282,8 @@ public class DockerOperationsImpl implements DockerOperations {
     public void executeCommandInNetworkNamespace(ContainerName containerName, String[] command) {
         final PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, containerName);
         final Integer containerPid = docker.getContainer(containerName)
-                .flatMap(container -> container.pid)
+                .filter(container -> container.state.isRunning())
+                .map(container -> container.pid)
                 .orElseThrow(() -> new RuntimeException("PID not found for container with name: " +
                         containerName.asString()));
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
index 836a68eb49c..236f53bc18e 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
@@ -96,11 +96,11 @@ public class AclMaintainer implements Runnable {
                 // Container belongs to this Docker host, but is currently unallocated
                 continue;
             }
-            if (!container.get().pid.isPresent()) {
-                log.info(String.format("PID for container %s not found (not running?)", container.get().name.asString()));
+            if (!container.get().state.isRunning()) {
+                log.info(String.format("Container with name %s is not running, skipping", container.get().name.asString()));
                 continue;
             }
-            applyAcl(container.get().name, new Acl(container.get().pid.get(), entry.getValue()));
+            applyAcl(container.get().name, new Acl(container.get().pid, entry.getValue()));
         }
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 0c3f0f4a139..57a354e5208 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -161,7 +161,7 @@ public class NodeAgentImpl implements NodeAgent {
 
         // If the container is already running, initialize vespaVersion
         vespaVersion = dockerOperations.getContainer(hostname)
-                .filter(container -> container.isRunning)
+                .filter(container -> container.state.isRunning())
                 .flatMap(container -> dockerOperations.getVespaVersion(container.name));
 
         loopThread = new Thread(this::loop);
@@ -279,7 +279,7 @@ public class NodeAgentImpl implements NodeAgent {
 
     private void restartServices(ContainerNodeSpec nodeSpec, Container existingContainer, Orchestrator orchestrator)
             throws Exception {
-        if (existingContainer.isRunning) {
+        if (existingContainer.state.isRunning()) {
             ContainerName containerName = existingContainer.name;
             if (nodeSpec.nodeState == Node.State.active) {
                 logger.info("Restarting services for " + containerName);
@@ -305,7 +305,7 @@ public class NodeAgentImpl implements NodeAgent {
             return Optional.of("The node is supposed to run a new Docker image: "
                                        + existingContainer + " -> " + nodeSpec.wantedDockerImage.get());
         }
-        if (!existingContainer.isRunning) {
+        if (!existingContainer.state.isRunning()) {
             return Optional.of("Container no longer running");
         }
         return Optional.empty();
@@ -323,7 +323,7 @@ public class NodeAgentImpl implements NodeAgent {
         if (removeReason.isPresent()) {
             logger.info("Will remove container " + existingContainer.get() + ": " + removeReason.get());
 
-            if (existingContainer.get().isRunning) {
+            if (existingContainer.get().state.isRunning()) {
                 final ContainerName containerName = existingContainer.get().name;
                 orchestratorSuspendNode(orchestrator, nodeSpec, logger);
                 dockerOperations.trySuspendNode(containerName);
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 9ab24f667d1..8d867a16c05 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
@@ -106,7 +106,7 @@ public class DockerOperationsImplTest {
 
     @Test
     public void runsCommandInNetworkNamespace() {
-        Container container = makeContainer("container-42", 42);
+        Container container = makeContainer("container-42", Container.State.RUNNING, 42);
         List<String> capturedArgs = new ArrayList<>();
         DockerOperationsImpl dockerOperations = new DockerOperationsImpl(docker, environment,
                 new MetricReceiverWrapper(MetricReceiver.nullImplementation), capturedArgs::addAll);
@@ -123,9 +123,9 @@ public class DockerOperationsImplTest {
                 "-nvL"), capturedArgs);
     }
 
-    private Container makeContainer(String name, int pid) {
+    private Container makeContainer(String name, Container.State state, int pid) {
         final Container container = new Container(name + ".fqdn", new DockerImage("mock"),
-                new ContainerName(name), true, Optional.of(pid));
+                new ContainerName(name), state, pid);
         when(docker.getContainer(eq(container.name))).thenReturn(Optional.of(container));
         return container;
     }
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 f30a8c8c16a..f3f4f76e767 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
@@ -57,7 +57,7 @@ public class LocalZoneUtils {
     public static void startConfigServerIfNeeded(Docker docker, Environment environment) throws UnknownHostException {
         Optional<Container> container = docker.getContainer(CONFIG_SERVER_HOSTNAME);
         if (container.isPresent()) {
-            if (container.get().isRunning) return;
+            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/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
index bdc336d92ca..75c25b3b93e 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
@@ -38,7 +38,7 @@ public class DockerMock implements Docker {
         synchronized (monitor) {
             callOrderVerifier.add("createContainerCommand with " + dockerImage +
                     ", HostName: " + hostName + ", " + containerName);
-            containers.add(new Container(hostName, dockerImage, containerName, true));
+            containers.add(new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 2));
         }
 
         return new StartContainerCommandMock();
@@ -64,11 +64,6 @@ public class DockerMock implements Docker {
     }
 
     @Override
-    public Optional<ContainerInfo> inspectContainer(ContainerName containerName) {
-        return Optional.of(() -> Optional.of(2));
-    }
-
-    @Override
     public Optional<ContainerStats> getContainerStats(ContainerName containerName) {
         return Optional.empty();
     }
@@ -86,7 +81,7 @@ public class DockerMock implements Docker {
             callOrderVerifier.add("stopContainer with " + containerName);
             containers = containers.stream()
                     .map(container -> container.name.equals(containerName) ?
-                            new Container(container.hostname, container.image, container.name, false) : container)
+                            new Container(container.hostname, container.image, container.name, Container.State.EXITED, 0) : container)
                     .collect(Collectors.toList());
         }
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
index 64fa757eb5d..159bae1fbe1 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java
@@ -63,7 +63,7 @@ public class AclMaintainerTest {
 
     @Test
     public void reconfigures_acl_when_container_pid_changes() {
-        Container container = makeContainer("container-1", true, Optional.of(42));
+        Container container = makeContainer("container-1");
         List<ContainerAclSpec> aclSpecs = makeAclSpecs(3, container.name);
         nodeRepository.addContainerAclSpecs(NODE_ADMIN_HOSTNAME, aclSpecs);
 
@@ -71,7 +71,7 @@ public class AclMaintainerTest {
         assertAclsApplied(container.name, aclSpecs);
 
         // Container is restarted and PID changes
-        makeContainer(container.name.asString(), true, Optional.of(43));
+        makeContainer(container.name.asString(), Container.State.RUNNING, 43);
         aclMaintainer.run();
 
         assertAclsApplied(container.name, aclSpecs, times(2));
@@ -79,7 +79,7 @@ public class AclMaintainerTest {
 
     @Test
     public void does_not_configure_acl_for_stopped_container() {
-        Container stoppedContainer = makeContainer("container-1", false, Optional.empty());
+        Container stoppedContainer = makeContainer("container-1", Container.State.EXITED, 0);
         List<ContainerAclSpec> aclSpecs = makeAclSpecs(1, stoppedContainer.name);
         nodeRepository.addContainerAclSpecs(NODE_ADMIN_HOSTNAME, aclSpecs);
         aclMaintainer.run();
@@ -142,12 +142,12 @@ public class AclMaintainerTest {
     }
 
     private Container makeContainer(String hostname) {
-        return makeContainer(hostname, true, Optional.of(42));
+        return makeContainer(hostname, Container.State.RUNNING, 42);
     }
 
-    private Container makeContainer(String hostname, boolean running, Optional<Integer> pid) {
+    private Container makeContainer(String hostname, Container.State state, int pid) {
         final Container container = new Container(hostname, new DockerImage("mock"),
-                new ContainerName(hostname), running, pid);
+                new ContainerName(hostname), state, pid);
         when(dockerOperations.getContainer(eq(hostname))).thenReturn(Optional.of(container));
         return container;
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
index a7c5703f4cc..17f70ce5efa 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
@@ -60,8 +60,7 @@ public class NodeAdminImplTest {
         final String hostName = "host";
         final DockerImage dockerImage = new DockerImage("image");
         final ContainerName containerName = new ContainerName("container");
-        final boolean isRunning = true;
-        final Container existingContainer = new Container(hostName, dockerImage, containerName, isRunning);
+        final Container existingContainer = new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 5);
         final ContainerNodeSpec nodeSpec = new ContainerNodeSpec.Builder()
                 .hostname(hostName)
                 .wantedDockerImage(dockerImage)
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 8a8206f8ccb..0781a303a57 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -92,7 +92,8 @@ public class NodeAgentImplTest {
                 .build();
 
         Docker.ContainerStats containerStats = new ContainerStatsImpl(new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>());
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, dockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 1)));
         when(dockerOperations.getContainerStats(any())).thenReturn(Optional.of(containerStats));
         when(dockerOperations.shouldScheduleDownloadOfImage(any())).thenReturn(false);
         when(dockerOperations.startContainerIfNeeded(eq(nodeSpec))).thenReturn(false);
@@ -190,7 +191,8 @@ public class NodeAgentImplTest {
 
         when(dockerOperations.shouldScheduleDownloadOfImage(any())).thenReturn(true);
         when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec));
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, oldDockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, oldDockerImage, containerName, Container.State.RUNNING, 1)));
 
         nodeAgent.tick();
 
@@ -255,7 +257,8 @@ public class NodeAgentImplTest {
                 .build();
 
         when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec));
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, dockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 1)));
 
         nodeAgent.vespaVersion = nodeSpec.vespaVersion;
 
@@ -292,7 +295,8 @@ public class NodeAgentImplTest {
                 .build();
 
         when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec));
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, dockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 1)));
 
         nodeAgent.vespaVersion = nodeSpec.vespaVersion;
 
@@ -330,7 +334,8 @@ public class NodeAgentImplTest {
                 .build();
 
         when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec));
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, dockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, dockerImage, containerName, Container.State.RUNNING, 1)));
 
         nodeAgent.vespaVersion = nodeSpec.vespaVersion;
 
@@ -370,12 +375,14 @@ public class NodeAgentImplTest {
 
         final ContainerNodeSpec nodeSpec = nodeSpecBuilder.build();
 
+        boolean shouldBeRunning = nodeState != Node.State.dirty && nodeState != Node.State.provisioned;
         when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec));
         when(dockerOperations.getContainer(eq(hostName))).thenReturn(
                 Optional.of(new Container(hostName,
                                           dockerImage,
                                           containerName,
-                                          nodeState != Node.State.dirty && nodeState != Node.State.provisioned)));
+                                          shouldBeRunning ? Container.State.RUNNING : Container.State.EXITED,
+                                          shouldBeRunning ? 1 : 0)));
 
         nodeAgent.tick();
 
@@ -433,7 +440,8 @@ public class NodeAgentImplTest {
 
         Docker.ContainerStats containerStats = new ContainerStatsImpl(new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>());
         when(dockerOperations.getContainerStats(any())).thenReturn(Optional.of(containerStats));
-        when(dockerOperations.getContainer(eq(hostName))).thenReturn(Optional.of(new Container(hostName, wantedDockerImage, containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, wantedDockerImage, containerName, Container.State.RUNNING, 1)));
         when(nodeRepository.getContainerNodeSpec(eq(hostName))).thenReturn(Optional.of(nodeSpec));
         when(dockerOperations.shouldScheduleDownloadOfImage(eq(wantedDockerImage))).thenReturn(false);
 
@@ -480,8 +488,8 @@ public class NodeAgentImplTest {
         final ContainerName containerName = new ContainerName("cont-name");
         when(dockerOperations.getContainerStats(eq(containerName))).thenReturn(Optional.of(stats));
 
-        when(dockerOperations.getContainer(eq(hostName)))
-                .thenReturn(Optional.of(new Container(hostName, new DockerImage("wantedDockerImage"), containerName, true)));
+        when(dockerOperations.getContainer(eq(hostName))).thenReturn(
+                Optional.of(new Container(hostName, new DockerImage("wantedDockerImage"), containerName, Container.State.RUNNING, 1)));
 
         nodeAgent.vespaVersion = Optional.of("1.2.3");
         ContainerNodeSpec.Owner owner = new ContainerNodeSpec.Owner("tester", "testapp", "testinstance");