diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-08-03 12:44:41 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-08-03 12:44:41 +0200 |
commit | a5272aa7474dde3843ebe3c42d872aabdda61bae (patch) | |
tree | 99d260bc4356a0373dfb5fc7b4295d862c1059e7 /configserver | |
parent | cb7bacfafde63f3464e962d21b4619741ae7f942 (diff) |
Log less
Diffstat (limited to 'configserver')
2 files changed, 6 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java index 3980ae9d980..8e5069abfed 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.maintenance; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.defaults.Defaults; @@ -38,4 +37,5 @@ public class FileDistributionMaintainer extends ConfigServerMaintainer { applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, maxUnusedFileReferenceAge); return true; } + } 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 92421f0523d..03290592a83 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 @@ -9,7 +9,7 @@ import com.yahoo.vespa.flags.FlagSource; import java.time.Duration; /** - * Removes inactive sessions + * Removes expired sessions and locks * <p> * Note: Unit test is in ApplicationRepositoryTest * @@ -29,18 +29,17 @@ public class SessionsMaintainer extends ConfigServerMaintainer { protected boolean maintain() { applicationRepository.deleteExpiredLocalSessions(); - // Expired remote sessions are sessions that belong to an application that have external deployments that - // are no longer active if (hostedVespa) { Duration expiryTime = Duration.ofHours(12); int deleted = applicationRepository.deleteExpiredRemoteSessions(expiryTime); - log.log(LogLevel.FINE, "Deleted " + deleted + " expired remote sessions, expiry time " + expiryTime); + log.log(LogLevel.FINE, () -> "Deleted " + deleted + " expired remote sessions older than " + expiryTime); } Duration lockExpiryTime = Duration.ofHours(12); - if (applicationRepository.deleteExpiredLocks(lockExpiryTime) > 0) - log.log(LogLevel.INFO, "Deleted " + applicationRepository.deleteExpiredLocks(lockExpiryTime) + " locks older than " + lockExpiryTime); + int deleted = applicationRepository.deleteExpiredLocks(lockExpiryTime); + log.log(LogLevel.FINE, () -> "Deleted " + deleted + " locks older than " + lockExpiryTime); return true; } + } |