aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-11-04 11:20:02 +0100
committerJon Marius Venstad <venstad@gmail.com>2019-11-04 11:20:02 +0100
commit59d99b7a98416a0eec86f1557e6f275955a5a5fb (patch)
treef1aa0263d654bc468fcb316c95a6c3a8ded412c9 /controller-server
parent20b0d6bb559d86b51e63a2e99a45dd814a3b58fb (diff)
Revert "Change complete when _all_ instances have it, not _any_"
This reverts commit 1fb8ad0c9eea7b096f85251e17a7d6b2ad3e1177. Cannot do this until DeploymentSteps accounts for instances.
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java8
1 files changed, 4 insertions, 4 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 359374e8575..9573f5d07f5 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
@@ -565,13 +565,13 @@ public class DeploymentTrigger {
: steps.productionJobs();
Change change = application.change();
- if (application.instances().values().stream().allMatch(instance ->
- jobs.stream().allMatch(job -> isComplete(application.change().withoutApplication(), application.change(), instance, job))))
+ for (Instance instance : application.instances().values()) {
+ if (jobs.stream().allMatch(job -> isComplete(application.change().withoutApplication(), application.change(), instance, job)))
change = change.withoutPlatform();
- if (application.instances().values().stream().allMatch(instance ->
- jobs.stream().allMatch(job -> isComplete(application.change().withoutPlatform(), application.change(), instance, job))))
+ if (jobs.stream().allMatch(job -> isComplete(application.change().withoutPlatform(), application.change(), instance, job)))
change = change.withoutApplication();
+ }
return change;
}