diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-08-29 23:07:23 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2018-08-29 23:37:58 +0200 |
commit | 1178189e38a66e20c89d399f5898848613194066 (patch) | |
tree | 22bf224309b511ba2a7f3466f27ff40317b7332d /node-admin | |
parent | c2a3a001bbc086a307f7900c02ed14798ffb6f61 (diff) |
Use getAllContainersManagedBy() instead of listAllContainersManagedBy()
Diffstat (limited to 'node-admin')
4 files changed, 13 insertions, 26 deletions
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(); } |