Merge pull request #24043 from vespa-engine/mpolden/more-records

Use records in dns package

4 files changed, 10 insertions, 8 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
index 078a0dfc685..19616f862ab 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
@@ -31,7 +31,9 @@ public class NameServiceDispatcher extends ControllerMaintainer {
 
     @Override
     protected double maintain() {
-        int requestCount = trueIntervalInSeconds(); // Dispatch 1 request per second
+        // Dispatch 1 request per second on average. Note that this is not entirely accurate because a NameService
+        // implementation may need to perform multiple API-specific requests to execute a single NameServiceRequest
+        int requestCount = trueIntervalInSeconds();
         try (var lock = db.lockNameServiceQueue()) {
             var queue = db.readNameServiceQueue();
             var instant = clock.instant();
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("<not suspended>") + "]";
+        return hostname + ": " + currentVersion.toFullString() + " -> " + wantedVersion.toFullString() +
+               " [zone=" + zone + ", suspendedAt=" + suspendedAt.map(Instant::toString)
+                                                                .orElse("<not suspended>") + "]";
     }
 
     /** 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<VespaVersion> 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(", ")));