From f49fd159f796121e866d74f477af37f80c2b1609 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 14 Sep 2022 13:27:42 +0200 Subject: Use Version::toFullString --- .../com/yahoo/vespa/hosted/controller/versions/NodeVersion.java | 4 +++- .../com/yahoo/vespa/hosted/controller/versions/OsVersion.java | 2 +- .../com/yahoo/vespa/hosted/controller/versions/VersionStatus.java | 8 +++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java index 04f5d9866f8..707fa85b6b6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java @@ -38,7 +38,9 @@ public record NodeVersion(HostName hostname, @Override public String toString() { - return hostname + ": " + currentVersion + " -> " + wantedVersion + " [zone=" + zone + ", suspendedAt=" + suspendedAt.map(Instant::toString).orElse("") + "]"; + return hostname + ": " + currentVersion.toFullString() + " -> " + wantedVersion.toFullString() + + " [zone=" + zone + ", suspendedAt=" + suspendedAt.map(Instant::toString) + .orElse("") + "]"; } /** Returns whether this is upgrading */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java index 30a88733ed3..6ed716bb4bf 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java @@ -24,7 +24,7 @@ public record OsVersion(Version version, CloudName cloud) implements Comparable< @Override public String toString() { - return "version " + version + " for " + cloud + " cloud"; + return "version " + version.toFullString() + " for " + cloud + " cloud"; } @Override diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index b0a37474af7..95cb7de3443 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.versions; -import ai.vespa.validation.Validation; -import com.yahoo.collections.Iterables; import com.yahoo.component.Version; import com.yahoo.config.provision.HostName; import com.yahoo.vespa.hosted.controller.Controller; @@ -122,10 +120,10 @@ public record VersionStatus(List versions) { .orElse(newSystemVersion); if (newSystemVersion.isBefore(systemVersion)) { log.warning("Refusing to lower system version from " + - systemVersion + + systemVersion.toFullString() + " to " + - newSystemVersion + - ", nodes on " + newSystemVersion + ": " + + newSystemVersion.toFullString() + + ", nodes on " + newSystemVersion.toFullString() + ": " + infrastructureVersions.get(newSystemVersion).stream() .map(HostName::value) .collect(Collectors.joining(", "))); -- cgit v1.2.3