diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-07-12 14:23:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 14:23:06 +0200 |
| commit | 393ed3b6ee5ef58094a7980363089bdd82ead7b5 (patch) | |
| tree | d97146297dd0194c9a1ba4c4f7be6472908ed675 | |
| parent | c85358081d0727b35d4ef43ec3a68b90012f041d (diff) | |
| parent | 470803fbe9340342be14bbc8d94726007bb075c1 (diff) | |
Merge pull request #27749 from vespa-engine/hmusum/expire-deprovisioned-nodes-in-test-zones-earlier-take-3
Expire deprovisioned nodes in test zones earlier
| -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..573298c142c 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(3) : 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 |