diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-06-04 10:33:39 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-06-04 10:33:39 +0200 |
| commit | d0f536c696af34fd3448fa33490c1846a8753eb9 (patch) | |
| tree | 378361e9cbea31cb640638bd4cd5d2bbcf2e9cbf /controller-server | |
| parent | f489483457969155f3b7483b3a865f131d556c8f (diff) | |
Filter out cooldowns which have already passed
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index 07dc8dbe7e8..2cf6c7e8670 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -560,7 +560,8 @@ public class DeploymentStatus { return firstFailing.equals(lastCompleted) ? Optional.of(lastCompleted) : Optional.of(lastCompleted.plus(Duration.ofMinutes(10)) .plus(Duration.between(firstFailing, lastCompleted) - .dividedBy(2))); + .dividedBy(2))) + .filter(status.now::isBefore); } private static JobStepStatus ofProductionDeployment(DeclaredZone step, List<StepStatus> dependencies, |