diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-09-20 12:26:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 12:26:54 +0200 |
| commit | c1d8a9f6bf3941f1388fb06fea2edd5eeeddbe6e (patch) | |
| tree | 844f5ead8bf9a263e0d9eceb235ea732b80d3402 /configserver | |
| parent | 122903006dd0f1074c0472094440acad32c68a27 (diff) | |
| parent | 8124d1863199ef45b743e8d6eb522fa6abec76a1 (diff) | |
Merge pull request #6972 from vespa-engine/hmusum/disable-tenants-maintainer
Disable TenantsMaintainer
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java | 7 |
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 c1fc484e23c..82b692e682f 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 @@ -19,7 +19,7 @@ import java.time.Duration; */ public class ConfigServerMaintenance extends AbstractComponent { - private final TenantsMaintainer tenantsMaintainer; + //private final TenantsMaintainer tenantsMaintainer; private final ZooKeeperDataMaintainer zooKeeperDataMaintainer; private final FileDistributionMaintainer fileDistributionMaintainer; private final SessionsMaintainer sessionsMaintainer; @@ -30,7 +30,8 @@ public class ConfigServerMaintenance extends AbstractComponent { Curator curator, FileDistributionFactory fileDistributionFactory) { DefaultTimes defaults = new DefaultTimes(configserverConfig); - tenantsMaintainer = new TenantsMaintainer(applicationRepository, curator, defaults.tenantsMaintainerInterval); + // TODO: Disabled until we have application metadata about applications + //tenantsMaintainer = new TenantsMaintainer(applicationRepository, curator, defaults.tenantsMaintainerInterval); zooKeeperDataMaintainer = new ZooKeeperDataMaintainer(applicationRepository, curator, defaults.defaultInterval); fileDistributionMaintainer = new FileDistributionMaintainer(applicationRepository, curator, defaults.defaultInterval, configserverConfig); sessionsMaintainer = new SessionsMaintainer(applicationRepository, curator, defaults.defaultInterval); @@ -38,7 +39,7 @@ public class ConfigServerMaintenance extends AbstractComponent { @Override public void deconstruct() { - tenantsMaintainer.deconstruct(); + //tenantsMaintainer.deconstruct(); zooKeeperDataMaintainer.deconstruct(); fileDistributionMaintainer.deconstruct(); sessionsMaintainer.deconstruct(); |