diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 12:24:34 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 12:24:34 +0200 |
commit | 2bd38b27ce02f6f80c6c51bdab3055e69d1ccb51 (patch) | |
tree | c92ff7dd8ff040d51fdfc09c491a325721c5866c /controller-server | |
parent | 2d2256d672da8512dca2f0056cfd6f0e5fc7e4f7 (diff) |
Improved commentary
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 4 |
1 files changed, 2 insertions, 2 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 04f945f3adf..ec08b9bd584 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 @@ -288,7 +288,7 @@ public class DeploymentTrigger { for (Step step : productionStepsOf(application)) { Set<JobType> stepJobs = step.zones().stream().map(order::toJob).collect(toSet()); 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. + if (jobsByCompletion.containsKey(Optional.empty())) { // Step is incomplete; trigger remaining jobs if ready, or their test jobs if untested. for (JobType job : jobsByCompletion.get(Optional.empty())) { Versions versions = versions(application, change, deploymentFor(application, job)); if (isTested(application, versions)) { @@ -306,7 +306,7 @@ public class DeploymentTrigger { } completedAt = Optional.empty(); } - else { // All jobs are complete -- find the time of completion of this step. + else { // All jobs are complete; find the time of completion of this step. if (stepJobs.isEmpty()) { // No jobs means this is delay step. Duration delay = ((DeploymentSpec.Delay) step).duration(); completedAt = completedAt.map(at -> at.plus(delay)).filter(at -> ! at.isAfter(clock.instant())); |