Lower OS upgrade grace period in CD

1 files changed, 6 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
index 79b7441cc34..afee9a55870 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
@@ -26,9 +26,6 @@ public class RetiringOsUpgrader implements OsUpgrader {
 
     private static final Logger LOG = Logger.getLogger(RetiringOsUpgrader.class.getName());
 
-    /** The duration this leaves new nodes alone before scheduling any upgrade */
-    static final Duration GRACE_PERIOD = Duration.ofDays(30);
-
     protected final NodeRepository nodeRepository;
 
     public RetiringOsUpgrader(NodeRepository nodeRepository) {
@@ -54,7 +51,7 @@ public class RetiringOsUpgrader implements OsUpgrader {
 
     @Override
     public boolean canUpgradeAt(Instant instant, Node node) {
-        return node.history().age(instant).compareTo(GRACE_PERIOD) > 0;
+        return node.history().age(instant).compareTo(gracePeriod()) > 0;
     }
 
     /** Returns nodes that are candidates for upgrade */
@@ -79,4 +76,9 @@ public class RetiringOsUpgrader implements OsUpgrader {
         nodeRepository.osVersions().writeChange((change) -> change.withRetirementAt(now, host.type()));
     }
 
+    /** The duration this leaves new nodes alone before scheduling any upgrade */
+    private Duration gracePeriod() {
+        return nodeRepository.zone().system().isCd() ? Duration.ofDays(1) : Duration.ofDays(30);
+    }
+
 }