diff options
| -rw-r--r-- | configdefinitions/src/vespa/configserver.def | 2 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index 0d216480c4e..c09054325ee 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -53,7 +53,7 @@ ztsUrl string default="" maintainerIntervalMinutes int default=30 # TODO: Default set to a high value (1 year) => maintainer will not run, change when maintainer verified out in prod tenantsMaintainerIntervalMinutes int default=525600 -keepUnusedFileReferencesHours int default=12 +keepUnusedFileReferencesHours int default=6 # Bootstrapping # How long bootstrapping can take before giving up (in seconds) 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 ed323438e3f..ed57be799c7 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 @@ -21,7 +21,7 @@ public class FileDistributionMaintainer extends ConfigServerMaintainer { private final ApplicationRepository applicationRepository; private final File fileReferencesDir; - private final ConfigserverConfig configserverConfig; + private final Duration maxUnusedFileReferenceAge; FileDistributionMaintainer(ApplicationRepository applicationRepository, Curator curator, @@ -30,13 +30,13 @@ public class FileDistributionMaintainer extends ConfigServerMaintainer { FlagSource flagSource) { super(applicationRepository, curator, flagSource, interval, interval); this.applicationRepository = applicationRepository; - this.configserverConfig = configserverConfig; + this.maxUnusedFileReferenceAge = Duration.ofHours(configserverConfig.keepUnusedFileReferencesHours()); this.fileReferencesDir = new File(Defaults.getDefaults().underVespaHome(configserverConfig.fileReferencesDir())); } @Override protected void maintain() { - applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, - Duration.ofHours(configserverConfig.keepUnusedFileReferencesHours())); + applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, maxUnusedFileReferenceAge); + } } |