Allow confidence to change from normal to high for older versions

2 files changed, 11 insertions, 10 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
index e3077cb232f..760ae894e37 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
@@ -71,7 +71,7 @@ public record DeploymentStatistics(Version version,
             JobList failing = status.jobs().failingHard();
 
             // Add all unsuccessful runs for failing production jobs as any run may have resulted in an incomplete deployment
-            // where a subset of nodes have upgraded.
+            // where a subset of nodes has upgraded.
             failing.not().failingApplicationChange()
                    .production()
                    .mapToList(JobStatus::runs)
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 4002da4699a..607b2a1fc1d 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
@@ -233,16 +233,17 @@ public record VersionStatus(List<VespaVersion> versions) {
 
         // Compute confidence
         if (!confidenceIsOverridden) {
-            // Always compute confidence for system and controller
-            if (isSystemVersion || isControllerVersion) {
-                confidence = VespaVersion.confidenceFrom(statistics, controller, versionStatus);
+            Confidence newConfidence = VespaVersion.confidenceFrom(statistics, controller, versionStatus);
+            Confidence oldConfidence = Optional.ofNullable(versionStatus.version(statistics.version()))
+                                               .map(VespaVersion::confidence)
+                                               .orElse(newConfidence);
+            // Always update confidence for system and controller
+            // Also allow older versions to transition from normal to high confidence
+            if (isSystemVersion || isControllerVersion || oldConfidence == Confidence.normal && newConfidence == Confidence.high) {
+                confidence = newConfidence;
             } else {
-                // This is an older version, so we preserve the existing confidence, if any
-                confidence = versionStatus.versions().stream()
-                                          .filter(v -> statistics.version().equals(v.versionNumber()))
-                                          .map(VespaVersion::confidence)
-                                          .findFirst()
-                                          .orElseGet(() -> VespaVersion.confidenceFrom(statistics, controller, versionStatus));
+                // Otherwise, this is an older version, so we preserve the existing confidence, if any
+                confidence = oldConfidence;
             }
         }