From 981453fee805ec48baca062f859ea4c3ad5b2201 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 18 Sep 2020 11:04:27 +0200 Subject: Use expiry time that matches timeouts used in config server --- .../vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 a5482281ef1..0890908dc80 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 @@ -182,7 +182,9 @@ public class NodeRepositoryMaintenance extends AbstractComponent { provisionedExpiry = Duration.ofHours(4); rebalancerInterval = Duration.ofMinutes(40); redeployMaintainerInterval = Duration.ofMinutes(1); - reservationExpiry = Duration.ofMinutes(15); // Need to be long enough for deployment to be finished for all config model versions + // Need to be long enough for deployment to be finished for all config model versions + // Should be equal to timeout for deployments + reservationExpiry = zone.system().isCd() ? Duration.ofMinutes(5) : Duration.ofMinutes(30); scalingSuggestionsInterval = Duration.ofMinutes(31); spareCapacityMaintenanceInterval = Duration.ofMinutes(10); throttlePolicy = NodeFailer.ThrottlePolicy.hosted; -- cgit v1.2.3