Merge pull request #24627 from vespa-engine/mpolden/controller-versionv8.76.18

Require same version across all controllers

2 files changed, 5 insertions, 7 deletions

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 607b2a1fc1d..d6b8f79dbe6 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
@@ -224,9 +224,9 @@ public record VersionStatus(List<VespaVersion> versions) {
                                               Controller controller,
                                               VersionStatus versionStatus) {
         ControllerVersion latestVersion = controllerVersions.stream().max(Comparator.naturalOrder()).get();
-        ControllerVersion controllerVersion = controllerVersions.stream().min(Comparator.naturalOrder()).get();
         boolean isSystemVersion = statistics.version().equals(systemVersion);
-        boolean isControllerVersion = statistics.version().equals(controllerVersion.version());
+        boolean isControllerVersion = controllerVersions.size() == 1 &&
+                                      statistics.version().equals(controllerVersions.iterator().next().version());
         VespaVersion.Confidence confidence = controller.curator().readConfidenceOverrides().get(statistics.version());
         boolean confidenceIsOverridden = confidence != null;
         VespaVersion existingVespaVersion = versionStatus.version(statistics.version());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index 72179aa669c..ee72a0ec339 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.zone.ZoneApi;
-import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.identifiers.ControllerVersion;
@@ -84,7 +83,7 @@ public class VersionStatusTest {
     }
 
     @Test
-    public void testControllerVersionIsVersionOfOldestController() {
+    public void testControllerVersion() {
         HostName controller1 = HostName.of("controller-1");
         HostName controller2 = HostName.of("controller-2");
         HostName controller3 = HostName.of("controller-3");
@@ -93,13 +92,12 @@ public class VersionStatusTest {
                                                    .collect(Collectors.joining(",")));
         ControllerTester tester = new ControllerTester(db);
 
+        // Upgrade in progress
         writeControllerVersion(controller1, Version.fromString("6.2"), db);
         writeControllerVersion(controller2, Version.fromString("6.1"), db);
         writeControllerVersion(controller3, Version.fromString("6.2"), db);
-
         VersionStatus versionStatus = VersionStatus.compute(tester.controller());
-        assertEquals(Version.fromString("6.1"),
-                     versionStatus.controllerVersion().get().versionNumber(), "Controller version is oldest version");
+        assertTrue(versionStatus.controllerVersion().isEmpty(), "Controller version is unknown during upgrade");
 
         // Last controller upgrades
         writeControllerVersion(controller2, Version.fromString("6.2"), db);