diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-09-30 08:10:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 08:10:58 +0200 |
| commit | 8963a1c15f17aa8b5ce2553fec93f2250ed1bb66 (patch) | |
| tree | e98818ed927ae34efedac73ee4bbca7001fa2570 | |
| parent | a4b31d5820ff788f2bd9dbd7319443cd9438cc5b (diff) | |
| parent | 229ba86651e9ba553d35a21745147fada6b96de1 (diff) | |
Merge pull request #14625 from vespa-engine/revert-14511-hmusum/move-check-outside-lock
Revert "Check if we can deploy outside of lock"
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java | 2 |
1 files changed, 1 insertions, 1 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 b41b7f15499..5df45bbc1b1 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 @@ -79,9 +79,9 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer { * @return whether it was successfully deployed */ protected final boolean deployWithLock(ApplicationId application) { - if ( ! canDeployNow(application)) return false; // redeployment is no longer needed try (MaintenanceDeployment deployment = new MaintenanceDeployment(application, deployer, metric, nodeRepository())) { if ( ! deployment.isValid()) return false; // this will be done at another config server + if ( ! canDeployNow(application)) return false; // redeployment is no longer needed log.log(Level.INFO, application + " will be deployed, last deploy time " + getLastDeployTime(application)); return deployment.activate().isPresent(); } finally { |