diff options
author | Harald Musum <musum@oath.com> | 2018-06-05 07:59:49 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-06-05 07:59:49 +0200 |
commit | 82c0e309938ea887b8b3ee83f3998b42560587f6 (patch) | |
tree | 9c98e6caf985ad24561f0a141db85d905959c8af | |
parent | 4051ce483f984c58fad988d1b2b0451af668406b (diff) |
Delete unused file references in test environments too
2 files changed, 5 insertions, 3 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 a80ecffd94a..1d1f9995036 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 @@ -310,14 +310,14 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye .stream() .map(FileReference::value) .collect(Collectors.toSet()))); - log.log(LogLevel.INFO, "File references in use : " + fileReferencesInUse); + log.log(LogLevel.DEBUG, "File references in use : " + fileReferencesInUse); // Find those on disk that are not in use Set<String> fileReferencesOnDisk = new HashSet<>(); File[] filesOnDisk = fileReferencesPath.listFiles(); if (filesOnDisk != null) fileReferencesOnDisk.addAll(Arrays.stream(filesOnDisk).map(File::getName).collect(Collectors.toSet())); - log.log(LogLevel.INFO, "File references on disk (in " + fileReferencesPath + "): " + fileReferencesOnDisk); + log.log(LogLevel.DEBUG, "File references on disk (in " + fileReferencesPath + "): " + fileReferencesOnDisk); Instant instant = Instant.now().minus(Duration.ofDays(14)); Set<String> fileReferencesToDelete = fileReferencesOnDisk 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 b725b72aec6..2664a0bde8c 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 @@ -2,6 +2,7 @@ package com.yahoo.vespa.config.server.maintenance; import com.yahoo.cloud.config.ConfigserverConfig; +import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.curator.Curator; @@ -31,7 +32,8 @@ public class FileDistributionMaintainer extends Maintainer { @Override protected void maintain() { // TODO: For now only deletes files in CD system - boolean deleteFiles = SystemName.from(configserverConfig.system()) == SystemName.cd; + boolean deleteFiles = (SystemName.from(configserverConfig.system()) == SystemName.cd) + || Environment.from(configserverConfig.environment()).isTest(); applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, deleteFiles); } } |