Add PID to Container class

2 files changed, 16 insertions, 4 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
index c23a11f18eb..e0c19a66111 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.dockerapi;
 
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @author stiankri
@@ -11,16 +12,23 @@ public class Container {
     public final DockerImage image;
     public final ContainerName name;
     public final boolean isRunning;
+    public final Optional<Integer> pid;
 
     public Container(
             final String hostname,
             final DockerImage image,
             final ContainerName containerName,
-            final boolean isRunning) {
+            final boolean isRunning,
+            final Optional<Integer> pid) {
         this.hostname = hostname;
         this.image = image;
         this.name = containerName;
         this.isRunning = isRunning;
+        this.pid = pid;
+    }
+
+    public Container(String hostname, DockerImage image, ContainerName name, boolean isRunning) {
+        this(hostname, image, name, isRunning, Optional.empty());
     }
 
     @Override
@@ -32,12 +40,13 @@ public class Container {
         return Objects.equals(hostname, other.hostname)
                 && Objects.equals(image, other.image)
                 && Objects.equals(name, other.name)
-                && Objects.equals(isRunning, other.isRunning);
+                && Objects.equals(isRunning, other.isRunning)
+                && Objects.equals(pid, other.pid);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(hostname, image, name, isRunning);
+        return Objects.hash(hostname, image, name, isRunning, pid);
     }
 
     @Override
@@ -47,6 +56,7 @@ public class Container {
                 + " image=" + image
                 + " name=" + name
                 + " isRunning=" + isRunning
+                + " pid=" + pid
                 + "}";
     }
 }
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 3681b65565d..11ba5f42c52 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
@@ -361,7 +361,9 @@ public class DockerImpl implements Docker {
                                 response.getConfig().getHostName(),
                                 new DockerImage(response.getConfig().getImage()),
                                 new ContainerName(decode(response.getName())),
-                                response.getState().getRunning()))
+                                response.getState().getRunning(),
+                                Optional.ofNullable(response.getState().getPid())
+                        ))
                 .map(Stream::of)
                 .orElse(Stream.empty());
     }