Merge pull request #13637 from vespa-engine/hmusum/add-more-debug-logging

Add some more debug logging

2 files changed, 5 insertions, 2 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 b7b5c6380ef..543f9c2e303 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
@@ -49,12 +49,15 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
 
     @Override
     protected void maintain() {
+        log.fine(() -> "Running");
         if (! distributeApplicationPackage.value()) return;
 
         try (var fileDownloader = new FileDownloader(createConnectionPool(configserverConfig), downloadDirectory)){
             for (var applicationId : applicationRepository.listApplications()) {
+                log.fine(() -> "Verifying application package for " + applicationId);
                 RemoteSession session = applicationRepository.getActiveSession(applicationId);
                 FileReference applicationPackage = session.getApplicationPackageReference();
+                log.fine(() -> "Verifying application package file reference " + applicationPackage + " for session " + session.getSessionId());
 
                 if (applicationPackage != null && missingOnDisk(applicationPackage)) {
                     log.fine(() -> "Downloading missing application package for application " + applicationId + " - session " + session.getSessionId());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
index 93e6c83fe5b..68345d3862d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionStateWatcher.java
@@ -42,8 +42,6 @@ public class RemoteSessionStateWatcher {
     }
 
     private void sessionChanged(Session.Status status) {
-        log.log(Level.FINE, session.logPre() + "Session change: Remote session " + session.getSessionId() + " changed status to " + status);
-
         // valid for NEW -> PREPARE transitions, not ACTIVATE -> PREPARE.
         if (status.equals(Session.Status.PREPARE)) {
             log.log(Level.FINE, session.logPre() + "Loading prepared session: " + session.getSessionId());
@@ -77,6 +75,8 @@ public class RemoteSessionStateWatcher {
                 ChildData node = fileCache.getCurrentData();
                 if (node != null) {
                     newStatus = Session.Status.parse(Utf8.toString(node.getData()));
+                    log.log(Level.FINE, session.logPre() + "Session change: Remote session " + session.getSessionId() +
+                                        " changed status from " + currentStatus.name() + " to " + newStatus.name());
                     sessionChanged(newStatus);
                 }
             } catch (Exception e) {