diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 12:14:56 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 12:14:56 +0200 |
| commit | 2d2256d672da8512dca2f0056cfd6f0e5fc7e4f7 (patch) | |
| tree | b95b7f6f33692b0d204e0c8fe57d3aab96c58c1d /controller-server | |
| parent | 6b93db5bc7f2c8434a30bc93c0967456e2178953 (diff) | |
Avoid mangling semantics for no reason
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 8 |
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 90bdce496cb..04f945f3adf 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 @@ -287,9 +287,9 @@ public class DeploymentTrigger { if (change.isPresent()) for (Step step : productionStepsOf(application)) { Set<JobType> stepJobs = step.zones().stream().map(order::toJob).collect(toSet()); - Map<Instant, List<JobType>> jobsByCompletion = stepJobs.stream().collect(groupingBy(job -> completedAt(change, application, job).orElse(Instant.MAX))); - if (jobsByCompletion.containsKey(Instant.MAX)) { // Step incomplete because some jobs remain, trigger those if the previous step was done, or required test steps. - for (JobType job : jobsByCompletion.get(Instant.MAX)) { + Map<Optional<Instant>, List<JobType>> jobsByCompletion = stepJobs.stream().collect(groupingBy(job -> completedAt(change, application, job))); + if (jobsByCompletion.containsKey(Optional.empty())) { // Step incomplete because some jobs remain, trigger those if the previous step was done, or required test steps. + for (JobType job : jobsByCompletion.get(Optional.empty())) { Versions versions = versions(application, change, deploymentFor(application, job)); if (isTested(application, versions)) { if ( completedAt.isPresent() @@ -313,7 +313,7 @@ public class DeploymentTrigger { reason += " after a delay of " + delay; } else { - completedAt = jobsByCompletion.keySet().stream().max(naturalOrder()); + completedAt = jobsByCompletion.keySet().stream().map(Optional::get).max(naturalOrder()); reason = "Available change in " + stepJobs.stream().map(JobType::jobName).collect(joining(", ")); } } |