From 803ab7d92db190f519bd3f3b1b6be9d90d9e232b Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 23 Jan 2019 20:21:12 +0100 Subject: Use same reservation expiry in all zones There is no difference in how we build models in dev and other zones anymore, and there are customers with large apps that need more than 10 minutes --- .../vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'node-repository') 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 2bc60de3c8d..ae1cb5d9392 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 @@ -179,19 +179,18 @@ public class NodeRepositoryMaintenance extends AbstractComponent { infrastructureProvisionInterval = Duration.ofMinutes(3); throttlePolicy = NodeFailer.ThrottlePolicy.hosted; loadBalancerExpiry = Duration.ofHours(1); + reservationExpiry = Duration.ofMinutes(20); // Need to be long enough for deployment to be finished for all config model versions 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(1); dirtyExpiry = Duration.ofMinutes(30); retiredExpiry = Duration.ofMinutes(20); - reservationExpiry = Duration.ofMinutes(10); } } -- cgit v1.2.3