Merge pull request #5907 from vespa-engine/hmusum/run-maintainer-in-cd

Run maintainer with different interval in CD (at all, as the default …

1 files changed, 4 insertions, 3 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 c8b3bc824a8..3e8e5ac11df 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,6 +3,7 @@ package com.yahoo.vespa.config.server.maintenance;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.AbstractComponent;
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.curator.Curator;
 
@@ -16,9 +17,9 @@ public class ConfigServerMaintenance extends AbstractComponent {
     public ConfigServerMaintenance(ConfigserverConfig configserverConfig,
                                    ApplicationRepository applicationRepository,
                                    Curator curator) {
-        tenantsMaintainer = new TenantsMaintainer(applicationRepository,
-                                                  curator,
-                                                  Duration.ofMinutes(configserverConfig.tenantsMaintainerIntervalMinutes()));
+        Duration interval = configserverConfig.system().equals(SystemName.cd.name()) ? Duration.ofMinutes(5) :
+                Duration.ofMinutes(configserverConfig.tenantsMaintainerIntervalMinutes());
+        tenantsMaintainer = new TenantsMaintainer(applicationRepository, curator, interval);
     }
 
     @Override