summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2022-10-27 21:17:40 +0200
committerGitHub <noreply@github.com>2022-10-27 21:17:40 +0200
commitd092241882ffbcee42d707ac364a39221bbe3990 (patch)
tree94dde5e8efc251300f4091e0ed866c5b51cfc905 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
parent846d36580f161bdb17333b43a0ebf1d8abd498ec (diff)
parentd319758c941449c15282d120ef77fb7cad0913d0 (diff)
Merge pull request #24627 from vespa-engine/mpolden/controller-versionv8.76.18
Require same version across all controllers
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java4
1 files changed, 2 insertions, 2 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());