Use getAllContainersManagedBy() instead of listAllContainersManagedBy()

6 files changed, 13 insertions, 36 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 98c5fe5a8a6..91d5125eba3 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
@@ -63,8 +63,6 @@ public interface Docker {
 
     List<Container> getAllContainersManagedBy(String manager);
 
-    List<ContainerName> listAllContainersManagedBy(String manager);
-
     Optional<Container> getContainer(ContainerName containerName);
 
     /**
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 dd241ad2c6a..958f1c70965 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
@@ -338,14 +338,6 @@ public class DockerImpl implements Docker {
     }
 
     @Override
-    public List<ContainerName> listAllContainersManagedBy(String manager) {
-        return listAllContainers().stream()
-                .filter(container -> isManagedBy(container, manager))
-                .map(container -> new ContainerName(decode(container.getNames()[0])))
-                .collect(Collectors.toList());
-    }
-
-    @Override
     public List<Container> getAllContainersManagedBy(String manager) {
         return listAllContainers().stream()
                 .filter(container -> isManagedBy(container, manager))
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
index 37ab6a08ffb..90d71c067bc 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperations.java
@@ -45,7 +45,5 @@ public interface DockerOperations {
      */
     List<Container> getAllManagedContainers();
 
-    List<ContainerName> listAllManagedContainers();
-
     void deleteUnusedDockerImages();
 }
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 7a51b7243f3..9e7eaa6f8c3 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
@@ -336,11 +336,6 @@ public class DockerOperationsImpl implements DockerOperations {
     }
 
     @Override
-    public List<ContainerName> listAllManagedContainers() {
-        return docker.listAllContainersManagedBy(MANAGER_NAME);
-    }
-
-    @Override
     public void deleteUnusedDockerImages() {
         docker.deleteUnusedDockerImages();
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 2e01f57f93b..54e492fa1f4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -58,12 +58,12 @@ public class NodeAdminImpl implements NodeAdmin {
     private final GaugeWrapper numberOfContainersInLoadImageState;
     private final CounterWrapper numberOfUnhandledExceptionsInNodeAgent;
 
-    public NodeAdminImpl(final DockerOperations dockerOperations,
-                         final Function<String, NodeAgent> nodeAgentFactory,
-                         final StorageMaintainer storageMaintainer,
-                         final Runnable aclMaintainer,
-                         final MetricReceiverWrapper metricReceiver,
-                         final Clock clock) {
+    public NodeAdminImpl(DockerOperations dockerOperations,
+                         Function<String, NodeAgent> nodeAgentFactory,
+                         StorageMaintainer storageMaintainer,
+                         Runnable aclMaintainer,
+                         MetricReceiverWrapper metricReceiver,
+                         Clock clock) {
         this.dockerOperations = dockerOperations;
         this.nodeAgentFactory = nodeAgentFactory;
         this.storageMaintainer = storageMaintainer;
@@ -80,14 +80,16 @@ public class NodeAdminImpl implements NodeAdmin {
     }
 
     @Override
-    public void refreshContainersToRun(final List<NodeSpec> containersToRun) {
-        final List<ContainerName> existingContainerNames = dockerOperations.listAllManagedContainers();
-        final List<String> containersToRunHostnames = containersToRun.stream()
+    public void refreshContainersToRun(List<NodeSpec> containersToRun) {
+        final List<ContainerName> existingContainerNames = dockerOperations.getAllManagedContainers().stream()
+                .map(container -> container.name)
+                .collect(Collectors.toList());
+        final List<String> hostnamesOfContainersToRun = containersToRun.stream()
                 .map(NodeSpec::getHostname)
                 .collect(Collectors.toList());
 
         storageMaintainer.cleanNodeAdmin();
-        synchronizeNodesToNodeAgents(containersToRunHostnames, existingContainerNames);
+        synchronizeNodesToNodeAgents(hostnamesOfContainersToRun, existingContainerNames);
         dockerOperations.deleteUnusedDockerImages();
 
         updateNodeAgentMetrics();
@@ -233,7 +235,7 @@ public class NodeAdminImpl implements NodeAdmin {
                 hostnameByContainerName.keySet().stream(), containerName -> containerName,
                 existingContainers.stream(), containerName -> containerName);
 
-        final Set<ContainerName> obsoleteAgentContainerNames = diff(nodeAgents.keySet(), new HashSet<>(hostnameByContainerName.keySet()));
+        final Set<ContainerName> obsoleteAgentContainerNames = diff(nodeAgents.keySet(), hostnameByContainerName.keySet());
         obsoleteAgentContainerNames.forEach(containerName -> nodeAgents.remove(containerName).stop());
 
         nodeSpecContainerPairs.forEach(nodeSpecContainerPair -> {
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 c10a63e85b7..9b9bb2af26c 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
@@ -15,7 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * Mock with some simple logic
@@ -65,13 +64,6 @@ public class DockerMock implements Docker {
     }
 
     @Override
-    public List<ContainerName> listAllContainersManagedBy(String manager) {
-        synchronized (monitor) {
-            return getAllContainersManagedBy(manager).stream().map(container -> container.name).collect(Collectors.toList());
-        }
-    }
-
-    @Override
     public Optional<ContainerStats> getContainerStats(ContainerName containerName) {
         return Optional.empty();
     }