diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-20 14:59:40 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-20 14:59:40 +0200 |
commit | a52195783c2d002eb8b026ea258df8f00a220cb9 (patch) | |
tree | 0bb1d751605f759cdf53e1136004ee7557ef0853 /node-repository | |
parent | adc3f3eaee4e53f5c1b68ccb22a943f0148b6f0e (diff) |
Set defaults as they were (except 10 min resExp for CD, which was 4)
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 11 |
1 files changed, 5 insertions, 6 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 454ede61243..22a47c24845 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 @@ -162,26 +162,25 @@ public class NodeRepositoryMaintenance extends AbstractComponent { operatorChangeRedeployInterval = Duration.ofMinutes(1); failedExpirerInterval = Duration.ofMinutes(10); provisionedExpiry = Duration.ofHours(4); - reservationExpiry = Duration.ofMinutes(20); // Need to be long enough for deployment to be finished for all config model versions rebootInterval = Duration.ofDays(30); nodeRetirerInterval = Duration.ofMinutes(30); metricsInterval = Duration.ofMinutes(1); infrastructureProvisionInterval = Duration.ofMinutes(3); throttlePolicy = NodeFailer.ThrottlePolicy.hosted; - if (zone.environment().isTest()) - retiredExpiry = Duration.ofMinutes(1); // fast turnaround as test envs don't have persistent data - else - retiredExpiry = Duration.ofDays(4); // give up migrating data after 4 days - if (zone.environment().equals(Environment.prod) && zone.system() == SystemName.main) { + 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); dirtyExpiry = Duration.ofHours(2); // enough time to clean the node + retiredExpiry = Duration.ofDays(4); // give up migrating data after 4 days + 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); dirtyExpiry = Duration.ofMinutes(30); + retiredExpiry = Duration.ofMinutes(1); // fast turnaround as test envs don't have persistent data + reservationExpiry = Duration.ofMinutes(10); } } |