Delete files when running FileDistributionMaintainer in all zones

2 files changed, 3 insertions, 12 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 e9d400591e8..b851c3dacfc 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
@@ -332,7 +332,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                 .filter(fileReference -> ! fileReferencesInUse.contains(fileReference))
                 .filter(fileReference -> isFileLastModifiedBefore(new File(fileReferencesPath, fileReference), instant))
                 .collect(Collectors.toSet());
-        if (deleteFromDisk) {
+        if (deleteFromDisk && fileReferencesToDelete.size() > 0) {
             log.log(LogLevel.INFO, "Will delete file references not in use: " + fileReferencesToDelete);
             fileReferencesToDelete.forEach(fileReference -> {
                 File file = new File(fileReferencesPath, fileReference);
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 1d16283d938..4f45b200111 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,8 +2,6 @@
 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;
 import com.yahoo.vespa.defaults.Defaults;
@@ -16,7 +14,6 @@ public class FileDistributionMaintainer extends Maintainer {
 
     private final ApplicationRepository applicationRepository;
     private final File fileReferencesDir;
-    private final ConfigserverConfig configserverConfig;
 
     FileDistributionMaintainer(ApplicationRepository applicationRepository,
                                Curator curator,
@@ -24,17 +21,11 @@ public class FileDistributionMaintainer extends Maintainer {
                                ConfigserverConfig configserverConfig) {
         super(applicationRepository, curator, interval);
         this.applicationRepository = applicationRepository;
-        this.configserverConfig = configserverConfig;
-        this.fileReferencesDir = new File(Defaults.getDefaults().underVespaHome(configserverConfig.fileReferencesDir()));;
+        this.fileReferencesDir = new File(Defaults.getDefaults().underVespaHome(configserverConfig.fileReferencesDir()));
     }
 
-
     @Override
     protected void maintain() {
-        // TODO: Delete files in all zones
-        boolean deleteFiles = (SystemName.from(configserverConfig.system()) == SystemName.cd)
-                || Environment.from(configserverConfig.environment()).isTest()
-                || configserverConfig.region().equals("us-central-1");
-        applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, deleteFiles);
+        applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, true /* delete files */);
     }
 }