diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-10-11 18:18:56 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-10-11 18:18:56 +0200 |
| commit | c7e411803f4c730de6a27cb7ccd032a38be343ce (patch) | |
| tree | d4e347b5c204b358822e428b60e8a6d783a54763 /controller-server | |
| parent | 6e0671776b82c951846fd237b2fbfc4181255575 (diff) | |
Orchestrate only instances from deployment spec
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 7 |
1 files changed, 6 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 a39880b9125..20e01dc850d 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 @@ -337,7 +337,12 @@ public class DeploymentTrigger { private List<Job> computeReadyJobs(TenantAndApplicationId id) { List<Job> jobs = new ArrayList<>(); applications().getApplication(id).ifPresent(application -> { - for (Instance instance : application.instances().values()) { + Collection<Instance> instances = application.deploymentSpec().equals(DeploymentSpec.empty) + ? application.instances().values() + : application.deploymentSpec().instances().stream() + .flatMap(instance -> application.get(instance.name()).stream()) + .collect(Collectors.toUnmodifiableList()); + for (Instance instance : instances) { Change change = application.change(); Optional<Instant> completedAt = max(instance.deploymentJobs().statusOf(systemTest) .<Instant>flatMap(job -> job.lastSuccess().map(JobRun::at)), |