diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-10-04 10:51:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-04 10:51:46 +0200 |
| commit | 6fe52f2ed1665f6fe29b74bbaec4db2c889ebacf (patch) | |
| tree | 44f090ff0eb10423d4258d71e9cf0b73291226b3 | |
| parent | 3edb198eec51ec6ea67b765f72d580bc57597e03 (diff) | |
| parent | ea63cff3348c17db312bae92e581b948f98a5086 (diff) | |
Merge pull request #10873 from vespa-engine/mpolden/change-interval
Reduce interval of OsUpgradeActivator in CD
| -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 02161caead6..29c0544420a 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 @@ -168,7 +168,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { loadBalancerExpirerInterval = Duration.ofMinutes(10); reservationExpiry = Duration.ofMinutes(20); // Need to be long enough for deployment to be finished for all config model versions dynamicProvisionerInterval = Duration.ofMinutes(5); - osUpgradeActivatorInterval = Duration.ofMinutes(5); + osUpgradeActivatorInterval = zone.system().isCd() ? Duration.ofSeconds(30) : Duration.ofMinutes(5); if (zone.environment().equals(Environment.prod) && ! zone.system().isCd()) { inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy |