Merge pull request #25242 from vespa-engine/hmusum/more-logging-changes

Logging changes and check if server is shutting down [run-systemtest]

4 files changed, 15 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index f15ab6c7370..4dccebb98b9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -444,7 +444,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         Tenant tenant = tenantRepository.getTenant(application.tenant());
         if (tenant == null) return Optional.empty();
         Optional<Instant> activatedTime = getActiveSession(tenant, application).map(Session::getActivatedTime);
-        log.log(Level.FINE, application + " last activated " + activatedTime.orElse(Instant.EPOCH));
+        log.log(Level.FINEST, application + " last activated " + activatedTime.orElse(Instant.EPOCH));
         return activatedTime;
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index e5a353b2415..7530d651f19 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -131,12 +131,18 @@ public class FileDirectory extends AbstractComponent {
         if (useLock.value())
             try (Lock lock = locks.lock(fileReference)) {
                 if (canBeDeleted.apply(fileReference))
-                    IOUtils.recursiveDeleteDir(destinationDir(fileReference));
+                    deleteDirRecursively(destinationDir(fileReference));
                 else
                     log.log(Level.FINE, "Unable to delete file reference '" + fileReference.value() + "' since it is still in use");
             }
         else
-            IOUtils.recursiveDeleteDir(destinationDir(fileReference));
+            deleteDirRecursively(destinationDir(fileReference));
+    }
+
+    private void deleteDirRecursively(File dir) {
+        log.log(Level.FINE, "Will delete dir " + dir);
+        if ( ! IOUtils.recursiveDeleteDir(dir))
+            log.log(Level.INFO, "Failed to delete " + dir);
     }
 
     // Check if we should add file, it might already exist
@@ -150,7 +156,7 @@ public class FileDirectory extends AbstractComponent {
             log.log(Level.WARNING, "Directory for file reference '" + fileReference.value() +
                     "' has content that does not match its hash, deleting everything in " +
                     destinationDir.getAbsolutePath());
-            IOUtils.recursiveDeleteDir(destinationDir);
+            deleteDirRecursively(destinationDir);
             return true;
         }
 
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 48d2a4c420f..df92dbac70f 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
@@ -70,6 +70,9 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
         int failures = 0;
 
         for (var applicationId : applicationRepository.listApplications()) {
+            if (shuttingDown())
+                break;
+            
             log.finest(() -> "Verifying application package for " + applicationId);
             Optional<Session> session = applicationRepository.getActiveSession(applicationId);
             if (session.isEmpty()) continue; // App might be deleted after call to listApplications() or not activated yet (bootstrap phase)
@@ -79,7 +82,8 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
                 long sessionId = session.get().getSessionId();
                 attempts++;
                 if (!fileReferenceExistsOnDisk(downloadDirectory, appFileReference)) {
-                    log.fine(() -> "Downloading application package for " + applicationId + " (session " + sessionId + ")");
+                    log.fine(() -> "Downloading application package with file reference " + appFileReference +
+                            " for " + applicationId + " (session " + sessionId + ")");
 
                     FileReferenceDownload download = new FileReferenceDownload(appFileReference,
                                                                                this.getClass().getSimpleName(),
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index ac33927bad9..07aca116683 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -79,7 +79,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import static com.yahoo.vespa.curator.Curator.CompletionWaiter;
 import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;