diff options
| author | Harald Musum <musum@oath.com> | 2018-06-08 08:51:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 08:51:33 +0200 |
| commit | 82b8b6fbe344e0b9582434a83a1b2df5eab31bf6 (patch) | |
| tree | 50285201f1c1f982eb2bd67867e0269f84a2ed05 | |
| parent | 0aa08de887726f4113d629839578d1c6c9c0d2a3 (diff) | |
| parent | 0547c637e0f70df2c9b3198d94cf4f1512b2ba87 (diff) | |
Merge pull request #6128 from vespa-engine/hmusum/run-maintainers-in-one-prod-zone-too
Run maintainers in one of the prod zones as well
2 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 c6a390caf86..2a53f9ee45c 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 @@ -51,7 +51,7 @@ public class ConfigServerMaintenance extends AbstractComponent { 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 to avoid running the maintainer - this.tenantsMaintainerInterval = isCd || isTest + this.tenantsMaintainerInterval = isCd || isTest || configserverConfig.region().equals("us-central-1") ? defaultInterval : Duration.ofMinutes(configserverConfig.tenantsMaintainerIntervalMinutes()); } 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 2664a0bde8c..1d16283d938 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 @@ -31,9 +31,10 @@ public class FileDistributionMaintainer extends Maintainer { @Override protected void maintain() { - // TODO: For now only deletes files in CD system + // TODO: Delete files in all zones boolean deleteFiles = (SystemName.from(configserverConfig.system()) == SystemName.cd) - || Environment.from(configserverConfig.environment()).isTest(); + || Environment.from(configserverConfig.environment()).isTest() + || configserverConfig.region().equals("us-central-1"); applicationRepository.deleteUnusedFiledistributionReferences(fileReferencesDir, deleteFiles); } } |