diff options
author | Harald Musum <musum@oath.com> | 2018-05-29 12:34:00 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-05-29 12:34:00 +0200 |
commit | 2a429fe54e125e91f679751a5de98530e19ca3bd (patch) | |
tree | 27f09ca7dec430f3bd01d1855d6edbccbfc2118f /node-repository | |
parent | 6cd4e8945facda874bf1ada7ea8694c2c633f9da (diff) |
Use lower expiry times and shorter intervals for non-main systems
Diffstat (limited to 'node-repository')
-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 4497f55cb85..62e954afba3 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 @@ -8,6 +8,7 @@ import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostLivenessTracker; import com.yahoo.config.provision.Provisioner; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -65,7 +66,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { HostLivenessTracker hostLivenessTracker, ServiceMonitor serviceMonitor, Zone zone, Clock clock, Orchestrator orchestrator, Metric metric, ConfigserverConfig configserverConfig) { - DefaultTimes defaults = new DefaultTimes(zone.environment()); + DefaultTimes defaults = new DefaultTimes(zone); jobControl = new JobControl(nodeRepository.database()); infrastructureVersions = new InfrastructureVersions(nodeRepository.database()); @@ -151,7 +152,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { private final NodeFailer.ThrottlePolicy throttlePolicy; - DefaultTimes(Environment environment) { + DefaultTimes(Zone zone) { failGrace = Duration.ofMinutes(60); periodicRedeployInterval = Duration.ofMinutes(30); operatorChangeRedeployInterval = Duration.ofMinutes(1); @@ -164,13 +165,14 @@ public class NodeRepositoryMaintenance extends AbstractComponent { infrastructureProvisionInterval = Duration.ofMinutes(3); throttlePolicy = NodeFailer.ThrottlePolicy.hosted; + Environment environment = zone.environment(); if (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 (environment.equals(Environment.prod)) { + if (environment.equals(Environment.prod) && zone.system() == SystemName.main) { 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 |