diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-05 12:23:27 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-05 12:25:35 +0200 |
| commit | 113315ed2cc6958bb9241f616f14c7f9f7c7c70e (patch) | |
| tree | 7c57f42ca47b7ed22b3dad6203acd0e4072b499e /controller-server | |
| parent | 81b9d23e0e85e73626ff6edea446741bb263b465 (diff) | |
Add convenience methods
Diffstat (limited to 'controller-server')
3 files changed, 4 insertions, 3 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 268965850ba..0268e187f35 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 @@ -102,9 +102,8 @@ public class DeploymentTrigger { public void triggerFailing(ApplicationId applicationId, Duration timeout) { try (Lock lock = applications().lock(applicationId)) { Application application = applications().require(applicationId); - if (!application.deploying().isPresent()) { // No ongoing change, no need to retry - return; - } + if (!application.deploying().isPresent()) return; // No ongoing change, no need to retry + // Retry first failing job for (JobType jobType : order.jobsFrom(application.deploymentSpec())) { JobStatus jobStatus = application.deploymentJobs().jobStatus().get(jobType); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 7aef1e413aa..142b6d6018b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -98,6 +98,7 @@ import java.util.logging.Level; * * @author bratseth */ +@SuppressWarnings("unused") // created by injection public class ApplicationApiHandler extends LoggingRequestHandler { private final Controller controller; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java index e02a31440ce..2230a36ecec 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java @@ -21,6 +21,7 @@ import java.util.logging.Level; * * @author bratseth */ +@SuppressWarnings("unused") // Created by injection public class ControllerApiHandler extends LoggingRequestHandler { private final ControllerMaintenance maintenance; |