diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-02 15:56:58 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-02 15:56:58 +0200 |
commit | 892f8d20ca43990a7f477600d3a1a29ecde44273 (patch) | |
tree | 3406c4c6f5b3b86364cacb9e076565dc0e2db5a2 /node-admin | |
parent | 69b97b155e3b8f74fe0239e709b952579d7b3036 (diff) |
Use <none> if no current docker image
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 7cef830655e..30ca2e0d218 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -160,7 +160,7 @@ public class StorageMaintainer { attributes.put("kernel_version", System.getProperty("os.version")); attributes.put("cpu_microcode_version", getMicrocodeVersion()); - getDockerImage(context, container).ifPresent(image -> attributes.put("docker_image", image)); + attributes.put("docker_image", getDockerImage(context, container)); context.node().parentHostname().ifPresent(parent -> attributes.put("parent_hostname", parent)); context.node().currentVespaVersion().ifPresent(version -> attributes.put("vespa_version", version.toFullString())); context.node().owner().ifPresent(owner -> { @@ -202,13 +202,11 @@ public class StorageMaintainer { return results[1].trim(); } - private Optional<String> getDockerImage(NodeAgentContext context, Optional<Container> container) { - return Stream.of( - container.map(c -> c.image.asString()), - context.node().currentDockerImage().map(DockerImage::asString), - context.node().wantedDockerImage().map(DockerImage::asString)) - .flatMap(Optional::stream) - .findFirst(); - + private String getDockerImage(NodeAgentContext context, Optional<Container> container) { + return container.map(c -> c.image.asString()) + .orElse(context.node().currentDockerImage() + .map(DockerImage::asString) + .orElse("<none>") + ); } } |