summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-03-27 13:01:10 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-03-27 13:01:10 +0200
commitc728595f48bc91f0b1cc29782039b400f6a05a9a (patch)
treed3f304f226ae95d5187fc6e225750861958331e9
parentcd751ee56ffa3aafac76136032dd62330c3f64ac (diff)
Removed unused code
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java14
1 files changed, 0 insertions, 14 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 68d80d54a3c..650414480f8 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
@@ -230,20 +230,6 @@ public class DeploymentTrigger {
private ApplicationController applications() { return controller.applications(); }
- /** Retry immediately only if this job just started failing. Otherwise retry periodically */
- private boolean retryBecauseNewFailure(Application application, JobType jobType) {
- JobStatus jobStatus = application.deploymentJobs().jobStatus().get(jobType);
- return (jobStatus != null && jobStatus.firstFailing().get().at().isAfter(clock.instant().minus(Duration.ofSeconds(10))));
- }
-
- /** Decide whether to retry due to capacity restrictions */
- private boolean retryBecauseOutOfCapacity(Application application, JobType jobType) {
- JobStatus jobStatus = application.deploymentJobs().jobStatus().get(jobType);
- if (jobStatus == null || ! jobStatus.jobError().equals(Optional.of(JobError.outOfCapacity))) return false;
- // Retry the job if it failed recently
- return jobStatus.firstFailing().get().at().isAfter(clock.instant().minus(Duration.ofMinutes(15)));
- }
-
/** Returns whether the given job type should be triggered according to deployment spec */
private boolean hasJob(JobType jobType, Application application) {
if ( ! jobType.isProduction()) return true; // Deployment spec only determines this for production jobs.