diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-13 17:58:05 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerij92@gmail.com> | 2019-03-13 19:32:29 +0100 |
| commit | 2f61e08501aa5315bb2e08135339917a96f84e3e (patch) | |
| tree | 27eed7b5a0a960eb494874659f6ff8610d089994 /node-repository | |
| parent | 1f4312394acfe37a264a29898b2b54078728ffa8 (diff) | |
Filter empty Vespa version from status
Diffstat (limited to 'node-repository')
3 files changed, 2 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java index 8affa21b59c..187fb639ac8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java @@ -107,8 +107,7 @@ public class MetricsReporter extends Maintainer { } Optional<Version> currentVersion = node.status().vespaVersion(); - // Node repo checks for !isEmpty(), so let's do that here too. - if (currentVersion.isPresent() && !currentVersion.get().isEmpty()) { + if (currentVersion.isPresent()) { double currentVersionNumber = getVersionAsNumber(currentVersion.get()); metric.set("currentVespaVersion", currentVersionNumber, context); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java index ff74e92b722..0f84ac1d6a6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java @@ -38,7 +38,7 @@ public class Status { Objects.requireNonNull(hardwareDivergence, "Hardware divergence must be non-null"); hardwareDivergence.ifPresent(s -> requireNonEmptyString(s, "Hardware divergence must be non-empty")); this.reboot = Objects.requireNonNull(generation, "Generation must be non-null"); - this.vespaVersion = Objects.requireNonNull(vespaVersion, "Vespa version must be non-null"); + this.vespaVersion = Objects.requireNonNull(vespaVersion, "Vespa version must be non-null").filter(v -> !Version.emptyVersion.equals(v)); this.failCount = failCount; this.hardwareFailureDescription = Objects.requireNonNull(hardwareFailureDescription, "Hardware failure description must be non-null"); this.wantToRetire = wantToRetire; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 1254664eb78..7858621b72d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -174,7 +174,6 @@ class NodesResponse extends HttpResponse { if (node.type().isDockerHost()) nodeRepository.firmwareChecks().requiredAfter().ifPresent(after -> object.setLong("wantedFirmwareCheck", after.toEpochMilli())); node.status().vespaVersion() - .filter(version -> !version.isEmpty()) .ifPresent(version -> { object.setString("vespaVersion", version.toFullString()); object.setString("currentDockerImage", nodeRepository.dockerImage().withTag(version).asString()); |