diff options
| author | jonmv <venstad@gmail.com> | 2022-10-28 14:47:19 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-10-28 14:47:19 +0200 |
| commit | 6e8c3cf510c1690009f80f7a5efb26097884e9fd (patch) | |
| tree | f57b84ac0c90d77d3c12a5c887cb1b36d050c506 /controller-server | |
| parent | 5bafc03be986f6edd34b30063c8d33320c240519 (diff) | |
Fix programming error
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 2 |
1 files changed, 1 insertions, 1 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 8f0786cb629..169cde8437a 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 @@ -378,7 +378,7 @@ public class DeploymentTrigger { DeploymentStatus.Job job = jobsList.get(0); if ( job.readyAt().isPresent() && ! clock.instant().isBefore(job.readyAt().get()) - && ! controller.jobController().isDisabled(jobId) + && ! controller.jobController().isDisabled(new JobId(jobId.application(), job.type())) && ! (jobId.type().isProduction() && isUnhealthyInAnotherZone(status.application(), jobId)) && abortIfRunning(status, jobsToRun, jobId)) // Abort and trigger this later if running with outdated parameters. jobs.add(deploymentJob(status.application().require(jobId.application().instance()), |