diff options
| author | jonmv <venstad@gmail.com> | 2022-10-11 13:54:50 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-10-11 13:54:50 +0200 |
| commit | a235a0f62327020f10ead81934f749cf426a3c47 (patch) | |
| tree | fe945b91c2a016d61d9d6a552e1b6cce5ece1900 /controller-server | |
| parent | b0c65e09beeb62e33cf9160c9408a3382c6f1328 (diff) | |
Use same criteria for what apps to manage, in different places
Diffstat (limited to 'controller-server')
3 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index cf09afa7181..2da70540b83 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -339,8 +339,8 @@ public class DeploymentTrigger { /** Returns the set of all jobs which have changes to propagate from the upstream steps. */ private List<Job> computeReadyJobs() { return jobs.deploymentStatuses(ApplicationList.from(applications().readable()) - .withProjectId() // Need to keep this, as we have applications with deployment spec that shouldn't be orchestrated. // Maybe not any longer? - .withDeploymentSpec()) + .withProjectId() // Need to keep this, as we have applications with deployment spec that shouldn't be orchestrated. + .withJobs()) .withChanges() .asList().stream() .filter(status -> ! hasExceededQuota(status.application().id().tenant())) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java index b33a43a2031..37b06fea066 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployer.java @@ -26,9 +26,8 @@ public class OutstandingChangeDeployer extends ControllerMaintainer { protected double maintain() { double ok = 0, total = 0; for (Application application : ApplicationList.from(controller().applications().readable()) - .withProductionDeployment() .withProjectId() - .withDeploymentSpec() + .withJobs() .asList()) try { ++total; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java index 037dacfcac9..d49cb244e47 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java @@ -70,7 +70,8 @@ public class Upgrader extends ControllerMaintainer { private DeploymentStatusList deploymentStatuses(VersionStatus versionStatus) { return controller().jobController().deploymentStatuses(ApplicationList.from(controller().applications().readable()) - .withProjectId(), + .withProjectId() + .withJobs(), versionStatus); } |