diff options
3 files changed, 22 insertions, 23 deletions
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 801b9b03bb4..e57f61ce5f4 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 @@ -276,17 +276,15 @@ public class DockerImpl implements Docker { private Stream<Container> asContainer(String container) { return inspectContainerCmd(container) - .map(response -> - new Container( - response.getConfig().getHostName(), - DockerImage.fromString(response.getConfig().getImage()), - containerResourcesFromHostConfig(response.getHostConfig()), - new ContainerName(decode(response.getName())), - Container.State.valueOf(response.getState().getStatus().toUpperCase()), - response.getState().getPid() - )) - .map(Stream::of) - .orElse(Stream.empty()); + .map(response -> new Container( + response.getConfig().getHostName(), + DockerImage.fromString(response.getConfig().getImage()), + containerResourcesFromHostConfig(response.getHostConfig()), + new ContainerName(decode(response.getName())), + Container.State.valueOf(response.getState().getStatus().toUpperCase()), + response.getState().getPid() + )) + .stream(); } private static ContainerResources containerResourcesFromHostConfig(HostConfig hostConfig) { 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 52d55dad087..e34e97dc2aa 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 @@ -150,7 +150,7 @@ public class DockerOperationsImpl implements DockerOperations { "ff02::1\tip6-allnodes\n" + "ff02::2\tip6-allrouters\n" + ipV6Local.getHostAddress() + '\t' + hostname + '\n'); - ipV4Local.ifPresent(ipv4 -> etcHosts.append(ipv4.getHostAddress() + '\t' + hostname + '\n')); + ipV4Local.ifPresent(ipv4 -> etcHosts.append(ipv4.getHostAddress()).append('\t').append(hostname).append('\n')); containerData.addFile(Paths.get("/etc/hosts"), etcHosts.toString()); } @@ -199,16 +199,17 @@ public class DockerOperationsImpl implements DockerOperations { @Override public ProcessResult executeCommandInNetworkNamespace(NodeAgentContext context, String... command) { - final int containerPid = docker.getContainer(context.containerName()) + int containerPid = docker.getContainer(context.containerName()) .filter(container -> container.state.isRunning()) .orElseThrow(() -> new RuntimeException( "Found no running container named " + context.containerName().asString())) .pid; - final String[] wrappedCommand = Stream.concat( - Stream.of("nsenter", String.format("--net=/proc/%d/ns/net", containerPid), "--"), - Stream.of(command)) - .toArray(String[]::new); + String[] wrappedCommand = Stream.concat(Stream.of("nsenter", + String.format("--net=/proc/%d/ns/net", containerPid), + "--"), + Stream.of(command)) + .toArray(String[]::new); try { Pair<Integer, String> result = processExecuter.exec(wrappedCommand); @@ -267,7 +268,7 @@ public class DockerOperationsImpl implements DockerOperations { } private static void addMounts(NodeAgentContext context, Docker.CreateContainerCommand command) { - final Path varLibSia = Paths.get("/var/lib/sia"); + Path varLibSia = Paths.get("/var/lib/sia"); // Paths unique to each container List<Path> paths = new ArrayList<>(Arrays.asList( 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 e9eacddb060..5b5d13ca346 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 @@ -154,9 +154,9 @@ public class NodeAdminImpl implements NodeAdmin { public void stopNodeAgentServices(List<String> hostnames) { // Each container may spend 1-1:30 minutes stopping hostnames.parallelStream() - .filter(nodeAgentWithSchedulerByHostname::containsKey) - .map(nodeAgentWithSchedulerByHostname::get) - .forEach(NodeAgentWithScheduler::stopForHostSuspension); + .filter(nodeAgentWithSchedulerByHostname::containsKey) + .map(nodeAgentWithSchedulerByHostname::get) + .forEach(NodeAgentWithScheduler::stopForHostSuspension); } @Override @@ -171,8 +171,8 @@ public class NodeAdminImpl implements NodeAdmin { } // Set-difference. Returns minuend minus subtrahend. - private static <T> Set<T> diff(final Set<T> minuend, final Set<T> subtrahend) { - final HashSet<T> result = new HashSet<>(minuend); + private static <T> Set<T> diff(Set<T> minuend, Set<T> subtrahend) { + var result = new HashSet<>(minuend); result.removeAll(subtrahend); return result; } |