Run TenantsMaintainer in test systems and delete unused files in CD

2 files changed, 8 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
index a08b077699c..c6a390caf86 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.maintenance;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.AbstractComponent;
-import com.yahoo.config.model.api.FileDistribution;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.config.server.session.FileDistributionFactory;
@@ -46,10 +46,14 @@ public class ConfigServerMaintenance extends AbstractComponent {
 
         DefaultTimes(ConfigserverConfig configserverConfig) {
             boolean isCd = configserverConfig.system().equals(SystemName.cd.name());
+            boolean isTest = Environment.from(configserverConfig.environment()).isTest();
 
             this.defaultInterval = Duration.ofMinutes(configserverConfig.maintainerIntervalMinutes());
-            // TODO: Want job control or feature flag to control when to run this, for now use a very long interval unless in CD
-            this.tenantsMaintainerInterval = isCd ? defaultInterval : Duration.ofMinutes(configserverConfig.tenantsMaintainerIntervalMinutes());
+            // TODO: Want job control or feature flag to control when to run this, for now use a very
+            // long interval to avoid running the maintainer
+            this.tenantsMaintainerInterval = isCd || isTest
+                    ? defaultInterval
+                    : Duration.ofMinutes(configserverConfig.tenantsMaintainerIntervalMinutes());
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 8f4a90ef85f..779571b737e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -265,7 +265,7 @@ public class TenantRepository implements ConnectionStateListener, PathChildrenCa
     public synchronized TenantRepository deleteTenant(TenantName name) {
         if (name.equals(DEFAULT_TENANT))
             throw new IllegalArgumentException("Deleting 'default' tenant is not allowed");
-        log.log(LogLevel.DEBUG, "Deleting tenant '" + name + "'");
+        log.log(LogLevel.INFO, "Deleting tenant '" + name + "'");
         Tenant tenant = tenants.remove(name);
         if (tenant == null) {
             throw new IllegalArgumentException("Deleting '" + name + "' failed, tenant does not exist");