diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-07-12 13:47:21 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-07-12 13:49:08 +0200 |
| commit | 6531d55c99254d91e740056c8724cf8a1d46f57b (patch) | |
| tree | 4a7f5d6101fdd09c4a89f7886070debad1b1dfeb /node-repository/src | |
| parent | 5b0ff16a85a4a4d7aaa424f5072a269c4c7ce356 (diff) | |
Expire deprovisioned nodes in test zones earlier take 2
Diffstat (limited to 'node-repository/src')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 f6391a7d475..06c23330b8a 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 @@ -128,6 +128,8 @@ public class NodeRepositoryMaintenance extends AbstractComponent { DefaultTimes(Zone zone, Deployer deployer) { boolean isCdZone = zone.system().isCd(); + boolean isProduction = zone.environment().isProduction(); + boolean isTest = zone.environment().isTest(); autoscalingInterval = Duration.ofMinutes(5); dynamicProvisionerInterval = Duration.ofMinutes(3); @@ -157,10 +159,10 @@ public class NodeRepositoryMaintenance extends AbstractComponent { throttlePolicy = NodeFailer.ThrottlePolicy.hosted; hostRetirerInterval = Duration.ofMinutes(30); hostFlavorUpgraderInterval = Duration.ofMinutes(30); - // CD (de)provisions hosts frequently. Expire deprovisioned ones earlier - deprovisionedExpiry = isCdZone ? Duration.ofDays(1) : Duration.ofDays(30); + // CD, test and staging (de)provisions hosts frequently. Expire deprovisioned ones earlier + deprovisionedExpiry = (isCdZone || isTest) ? Duration.ofDays(1) : Duration.ofDays(30); - if (zone.environment().isProduction() && ! isCdZone) { + if (isProduction && ! isCdZone) { inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy retiredInterval = Duration.ofMinutes(15); dirtyExpiry = Duration.ofHours(2); // enough time to clean the node |