summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-06-15 13:04:27 +0200
committerHarald Musum <musum@verizonmedia.com>2021-06-15 13:04:27 +0200
commitb6392266ccee8cb3e0d3e526ce9291e659c9f73f (patch)
tree7c8507ae9cfa32f8f816b5b4d787644622f85d89 /configserver
parent062427cbeacac0f2850558976da56a7789983b62 (diff)
Make sure to always log when all apps have redeployed
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index 772c2bf5125..4c2aa33a886 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -270,15 +270,20 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
}
});
if ( ! Duration.between(lastLogged, Instant.now()).minus(Duration.ofSeconds(10)).isNegative()) {
- log.log(Level.INFO, () -> finishedDeployments.size() + " of " + applicationCount + " apps redeployed " +
- "(" + failedDeployments.size() + " failed)");
+ logProgress(applicationCount, failedDeployments, finishedDeployments);
lastLogged = Instant.now();
}
} while (failedDeployments.size() + finishedDeployments.size() < applicationCount);
+ logProgress(applicationCount, failedDeployments, finishedDeployments);
return new ArrayList<>(failedDeployments);
}
+ private void logProgress(int applicationCount, Set<ApplicationId> failedDeployments, Set<ApplicationId> finishedDeployments) {
+ log.log(Level.INFO, () -> finishedDeployments.size() + " of " + applicationCount + " apps redeployed " +
+ "(" + failedDeployments.size() + " failed)");
+ }
+
private DeploymentStatus getDeploymentStatus(ApplicationId applicationId, Future<?> future) {
try {
future.get(1, TimeUnit.MILLISECONDS);