summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-09-21 07:53:58 +0200
committerHarald Musum <musum@oath.com>2018-09-21 07:53:58 +0200
commit4fd846366933660729babf8ad7d7a07fe3e7ed8d (patch)
treed00a9ca8658d697ac72272802177bd1d53101151 /node-repository
parent78dc12e09a15786a25df0f3f3914d40c36c4c268 (diff)
Check more often for retired nodes in CD
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java5
1 files changed, 2 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 0e7d0916e93..ded19a84f0d 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
@@ -168,7 +168,6 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
infrastructureProvisionInterval = Duration.ofMinutes(3);
throttlePolicy = NodeFailer.ThrottlePolicy.hosted;
-
if (zone.environment().equals(Environment.prod) && zone.system() != SystemName.cd) {
inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy
retiredInterval = Duration.ofMinutes(29);
@@ -177,9 +176,9 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
reservationExpiry = Duration.ofMinutes(20); // Need to be long enough for deployment to be finished for all config model versions
} else {
inactiveExpiry = Duration.ofSeconds(2); // support interactive wipe start over
- retiredInterval = Duration.ofMinutes(5);
+ retiredInterval = Duration.ofMinutes(1);
dirtyExpiry = Duration.ofMinutes(30);
- retiredExpiry = Duration.ofMinutes(20); // fast turnaround as test envs don't have persistent data
+ retiredExpiry = Duration.ofMinutes(20);
reservationExpiry = Duration.ofMinutes(10);
}
}