diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-05-31 13:22:28 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-05-31 13:22:28 +0200 |
| commit | 520ed7a5351b7f0ba5a677211040468484342e73 (patch) | |
| tree | f73286734da9e1fee5842d37c07126600f9a8bd5 /node-repository | |
| parent | 996f7da30eed7e604cb89af2af0f6d00fee46be7 (diff) | |
Change maintainers to use isCd()
Diffstat (limited to 'node-repository')
2 files changed, 4 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java index 4b086e1ea09..684f6dbcd50 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java @@ -63,15 +63,15 @@ public class FailedExpirer extends Maintainer { this.nodeRepository = nodeRepository; this.zone = zone; this.clock = clock; - if (zone.system() == SystemName.main) { + if (zone.system().isCd()) { + defaultExpiry = containerExpiry = Duration.ofMinutes(30); + } else { if (zone.environment() == Environment.staging || zone.environment() == Environment.test) { defaultExpiry = Duration.ofHours(1); } else { defaultExpiry = Duration.ofDays(4); } containerExpiry = Duration.ofHours(1); - } else { - defaultExpiry = containerExpiry = Duration.ofMinutes(30); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index 50a371458ce..9ace6ad55ef 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -184,7 +184,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { hostProvisionerInterval = Duration.ofMinutes(5); hostDeprovisionerInterval = Duration.ofMinutes(5); - if (zone.environment().equals(Environment.prod) && zone.system() != SystemName.cd) { + if (zone.environment().equals(Environment.prod) && ! zone.system().isCd()) { inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy retiredInterval = Duration.ofMinutes(10); dirtyExpiry = Duration.ofHours(2); // enough time to clean the node |