Reduce expiry time for session locks from 12 to 6 hours

3 files changed, 5 insertions, 5 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 62d5184d7a9..935b455c947 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
@@ -697,7 +697,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         sessionsPerTenant.keySet().forEach(tenant -> tenant.getSessionRepository().deleteExpiredSessions(activeSessions));
     }
 
-    public int deleteExpiredLocks(Duration expiryTime) {
+    public int deleteExpiredSessionLocks(Duration expiryTime) {
         return tenantRepository.getAllTenants()
                 .stream()
                 .map(tenant -> tenant.getSessionRepository().deleteExpiredLocks(clock, expiryTime))
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java
index 911b31077ea..5b3241d883d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java
@@ -35,8 +35,8 @@ public class SessionsMaintainer extends ConfigServerMaintainer {
             log.log(LogLevel.FINE, () -> "Deleted " + deleted + " expired remote sessions older than " + expiryTime);
         }
 
-        Duration lockExpiryTime = Duration.ofHours(12);
-        int deleted = applicationRepository.deleteExpiredLocks(lockExpiryTime);
+        Duration lockExpiryTime = Duration.ofHours(6);
+        int deleted = applicationRepository.deleteExpiredSessionLocks(lockExpiryTime);
         log.log(LogLevel.FINE, () -> "Deleted " + deleted + " locks older than " + lockExpiryTime);
 
         return true;
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 9b337c97d88..0d4bd33d75f 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
@@ -172,13 +172,13 @@ public class SessionRepository {
     }
 
     public void deleteExpiredSessions(Map<ApplicationId, Long> activeSessions) {
-        log.log(Level.FINE, "Purging old sessions");
+        log.log(Level.FINE, "Purging old sessions for tenant '" + tenantName + "'");
         try {
             for (LocalSession candidate : localSessionCache.getSessions()) {
                 Instant createTime = candidate.getCreateTime();
                 log.log(Level.FINE, "Candidate session for deletion: " + candidate.getSessionId() + ", created: " + createTime);
 
-                // Sessions with state other than ACTIVATED
+                // Sessions with state other than ACTIVATE
                 if (hasExpired(candidate) && !isActiveSession(candidate)) {
                     deleteLocalSession(candidate);
                 } else if (createTime.plus(Duration.ofDays(1)).isBefore(clock.instant())) {