diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-17 09:59:30 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-17 09:59:30 +0100 |
| commit | e70d81a2834c3b3a40f722d605277dd8a6bb3448 (patch) | |
| tree | 881ef29a81bf5562aa4fb5bcda9e5e4e7ec47a20 /node-repository | |
| parent | b09d7deb64e5a723c5a052dd2b1db225f632405f (diff) | |
Nonfunctional change
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java index 107f5a4b842..b39c24422a0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java @@ -51,13 +51,12 @@ public class ApplicationMaintainer extends Maintainer { // // Lock is acquired with a low timeout to reduce the chance of colliding with an external deployment. try (Mutex lock = nodeRepository().lock(application, Duration.ofSeconds(1))) { - if (isApplicationActive(application)) { - Optional<Deployment> deployment = deployer.deployFromLocalActive(application, Duration.ofMinutes(30)); - if ( ! deployment.isPresent()) continue; // this will be done at another config server + if ( ! isActive(application)) continue; + Optional<Deployment> deployment = deployer.deployFromLocalActive(application, Duration.ofMinutes(30)); + if ( ! deployment.isPresent()) continue; // this will be done at another config server - deployment.get().prepare(); - deployment.get().activate(); - } + deployment.get().prepare(); + deployment.get().activate(); } } catch (RuntimeException e) { @@ -69,8 +68,8 @@ public class ApplicationMaintainer extends Maintainer { @Override public String toString() { return "Periodic application redeployer"; } - private boolean isApplicationActive(ApplicationId application) { - return !nodeRepository().getNodes(application, Node.State.active).isEmpty(); + private boolean isActive(ApplicationId application) { + return ! nodeRepository().getNodes(application, Node.State.active).isEmpty(); } static Set<ApplicationId> getActiveApplications(NodeRepository nodeRepository) { |