diff options
4 files changed, 6 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 2db3d42c371..638abd04446 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -751,7 +751,7 @@ public class JobController { List<Version> versions = new ArrayList<>(List.of(systemVersion)); for (VespaVersion version : versionStatus.deployableVersions()) - if (version.confidence().equalOrHigherThan(Confidence.low)) + if (version.confidence().equalOrHigherThan(Confidence.normal)) versions.add(version.versionNumber()); instance.map(Instance::deployments) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java index 93ef6d29450..99150ee8bc0 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java @@ -37,7 +37,7 @@ public class DeploymentUpgrader extends ControllerMaintainer { Version targetPlatform = null; // Upgrade to the newest non-broken, deployable version. for (VespaVersion platform : controller().readVersionStatus().deployableVersions()) - if (platform.confidence().equalOrHigherThan(VespaVersion.Confidence.low)) + if (platform.confidence().equalOrHigherThan(VespaVersion.Confidence.normal)) targetPlatform = platform.versionNumber(); if (targetPlatform == null) @@ -56,6 +56,7 @@ public class DeploymentUpgrader extends ControllerMaintainer { if (application.revisions().get(last.versions().targetRevision()).compileVersion() .map(version -> controller().applications().versionCompatibility(instance.id()).refuse(version, target.targetPlatform())) .orElse(false)) continue; + if ( ! deployment.version().isBefore(target.targetPlatform())) continue; if ( ! isLikelyNightFor(job)) continue; 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 add95c2f7b2..77b2182934e 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 @@ -227,7 +227,7 @@ public record VersionStatus(List<VespaVersion> versions) { if (isSystemVersion || isControllerVersion) { confidence = VespaVersion.confidenceFrom(statistics, controller); } else { - // This is an older version so we preserve the existing confidence, if any + // 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) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java index 9daf8da4467..044d9402629 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java @@ -2308,9 +2308,9 @@ public class DeploymentTriggerTest { dev1.assertNotRunning(JobType.dev("us-east-1")); tester.controllerTester().upgradeSystem(version2); - tester.upgrader().overrideConfidence(version2, Confidence.low); + tester.upgrader().overrideConfidence(version2, Confidence.normal); tester.controllerTester().computeVersionStatus(); - assertEquals(version1, tester.newDeploymentContext("t", "a4", "default").submit().deploy().application().oldestDeployedPlatform().get()); + assertEquals(version2, tester.newDeploymentContext("t", "a4", "default").submit().deploy().application().oldestDeployedPlatform().get()); assertEquals(version1, dev1.runJob(JobType.dev("us-east-1"), DeploymentContext.applicationPackage()).deployment(ZoneId.from("dev", "us-east-1")).version()); assertEquals(version2, dev2.runJob(JobType.dev("us-east-1"), DeploymentContext.applicationPackage()).deployment(ZoneId.from("dev", "us-east-1")).version()); |