Merge pull request #18266 from vespa-engine/hmusum/log-more-at-bootstrap

Make sure to always log when all apps have redeployed

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);