Merge pull request #20003 from vespa-engine/hmusum/download-logging

Improve file download logging a bit

2 files changed, 11 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index d4d4a7fa7d3..5702a6b78cf 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -61,25 +61,24 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
 
         try (var fileDownloader = createFileDownloader()) {
             for (var applicationId : applicationRepository.listApplications()) {
-                log.fine(() -> "Verifying application package for " + applicationId);
+                log.finest(() -> "Verifying application package for " + applicationId);
                 Session session = applicationRepository.getActiveSession(applicationId);
                 if (session == null) continue;  // App might be deleted after call to listApplications() or not activated yet (bootstrap phase)
 
-                FileReference applicationPackage = session.getApplicationPackageReference();
-                long sessionId = session.getSessionId();
-                log.fine(() -> "Verifying application package file reference " + applicationPackage + " for session " + sessionId);
-
-                if (applicationPackage != null) {
+                FileReference appFileReference = session.getApplicationPackageReference();
+                if (appFileReference != null) {
+                    long sessionId = session.getSessionId();
                     attempts++;
-                    if (! fileReferenceExistsOnDisk(downloadDirectory, applicationPackage)) {
-                        log.fine(() -> "Downloading missing application package for application " + applicationId + " (session " + sessionId + ")");
+                    if (! fileReferenceExistsOnDisk(downloadDirectory, appFileReference)) {
+                        log.fine(() -> "Downloading application package for " + applicationId + " (session " + sessionId + ")");
 
-                        FileReferenceDownload download = new FileReferenceDownload(applicationPackage,
+                        FileReferenceDownload download = new FileReferenceDownload(appFileReference,
                                                                                    false,
                                                                                    this.getClass().getSimpleName());
                         if (fileDownloader.getFile(download).isEmpty()) {
                             failures++;
-                            log.warning("Failed to download application package for application " + applicationId + " (session " + sessionId + ")");
+                            log.warning("Failed to download application package (" + appFileReference + ")" +
+                                                "for " + applicationId + " (session " + sessionId + ")");
                             continue;
                         }
                     }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index 445106f4fe4..8a968fbdca2 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -105,9 +105,9 @@ public class FileReferenceDownloader {
                 return false;
             }
         } else {
-            log.log(logLevel, () -> "Downloading file " + fileReference + " from " + connection.getAddress() + " failed: " +
+            log.log(logLevel, "Downloading file " + fileReference + " from " + connection.getAddress() + " failed: " +
                                     request + ", error: " + request.errorMessage() + ", will use another config server for next request" +
-                                    " (retry count " + retryCount + ", rpc timeout " + rpcTimeout.getSeconds() + ")");
+                                    " (retry " + retryCount + ", rpc timeout " + timeoutSecs + " seconds)");
             connectionPool.switchConnection(connection);
             return false;
         }