aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-05-23 08:40:17 +0200
committerHarald Musum <musum@oath.com>2018-05-23 08:40:17 +0200
commit3f7da2c08cb3287a0d08f083c56110dd31c4d512 (patch)
tree377b44c6ffd05c8c87ada003e1e9f494607a6462
parent34dfa57d26e8a54a576b037c01d7f0a2baa2b460 (diff)
Run maintainer with different interval in CD (at all, as the default interval is now)
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java7
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