diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-03-09 15:24:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 15:24:01 +0100 |
| commit | 28bbce28156542b630bdf62ac6e6633d28f0a69f (patch) | |
| tree | d7e2703aef64b6126d4141a9e4454eeac6a202c7 | |
| parent | 1ce85daf1b01dd8d528c684e084e1d68b45bbf97 (diff) | |
| parent | b6772df965bb9ce730f73f4c6f4682559a912cbf (diff) | |
Merge pull request #16851 from vespa-engine/freva/shorten-expiry
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 2 |
1 files changed, 1 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 edbdd982a60..08106a94205 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 @@ -139,7 +139,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { // Vespa upgrade frequency is higher in CD so (de)activate OS upgrades more frequently as well osUpgradeActivatorInterval = zone.system().isCd() ? Duration.ofSeconds(30) : Duration.ofMinutes(5); periodicRedeployInterval = Duration.ofMinutes(60); - provisionedExpiry = Duration.ofHours(4); + provisionedExpiry = zone.getCloud().dynamicProvisioning() ? Duration.ofMinutes(40) : Duration.ofHours(4); rebalancerInterval = Duration.ofMinutes(120); redeployMaintainerInterval = Duration.ofMinutes(1); // Need to be long enough for deployment to be finished for all config model versions |