summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2020-09-07 22:21:26 +0200
committerGitHub <noreply@github.com>2020-09-07 22:21:26 +0200
commitce5821c363e11b49d66c798159c6611f21c4c149 (patch)
tree1cc5c3458ee306e0460d376103f7d3e68526ca5f
parente14cd485f49020b5b611ff559e4a8b8194d3d25c (diff)
parent662f4b16061088cef146226ba7d078953898bc59 (diff)
Merge pull request #14317 from vespa-engine/bratseth/only-log-when-we-redeploy
Only log when we really redeploy
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java3
1 files changed, 1 insertions, 2 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 9980335bab0..0a94764d948 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
@@ -64,8 +64,6 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer {
*/
protected void deploy(ApplicationId application) {
if (pendingDeployments.addIfAbsent(application)) { // Avoid queuing multiple deployments for same application
- log.log(Level.INFO, application + " will be deployed, last deploy time " +
- getLastDeployTime(application));
deploymentExecutor.execute(() -> deployWithLock(application));
}
}
@@ -84,6 +82,7 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer {
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();
} finally {
pendingDeployments.remove(application);