Merge pull request #14443 from vespa-engine/hmusum/increase-reservation-expiry

Use expiry time that matches timeouts used in config server

1 files changed, 3 insertions, 1 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 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;