Add deferOsUpgrade field to node response

3 files changed, 16 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java
index 7c6d1cb69db..440046ab818 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsVersions.java
@@ -84,7 +84,7 @@ public class OsVersions {
             Version target = Optional.ofNullable(change.targets().get(nodeType))
                                      .map(OsVersionTarget::version)
                                      .orElse(Version.emptyVersion);
-            chooseUpgrader(nodeType, target).disableUpgrade(nodeType);
+            chooseUpgrader(nodeType, Optional.of(target)).disableUpgrade(nodeType);
             return change.withoutTarget(nodeType);
         });
     }
@@ -120,7 +120,7 @@ public class OsVersions {
         try (Lock lock = db.lockOsVersionChange()) {
             OsVersionTarget target = readChange().targets().get(nodeType);
             if (target == null) return; // No target set for this type
-            OsUpgrader upgrader = chooseUpgrader(nodeType, target.version());
+            OsUpgrader upgrader = chooseUpgrader(nodeType, Optional.of(target.version()));
             if (resume) {
                 upgrader.upgradeTo(target);
             } else {
@@ -129,17 +129,23 @@ public class OsVersions {
         }
     }
 
+    /** Returns whether node can be upgraded now */
+    public boolean canUpgrade(Node node) {
+        return chooseUpgrader(node.type(), Optional.empty()).canUpgradeAt(nodeRepository.clock().instant(), node);
+    }
+
     /** Returns the upgrader to use when upgrading given node type to target */
-    private OsUpgrader chooseUpgrader(NodeType nodeType, Version target) {
+    private OsUpgrader chooseUpgrader(NodeType nodeType, Optional<Version> target) {
         if (reprovisionToUpgradeOs) {
             return new RetiringOsUpgrader(nodeRepository);
         }
         // Require rebuild if we have any nodes of this type on a major version lower than target
-        boolean rebuildRequired = nodeRepository.nodes().list(Node.State.active).nodeType(nodeType).stream()
+        boolean rebuildRequired = target.isPresent() &&
+                                  nodeRepository.nodes().list(Node.State.active).nodeType(nodeType).stream()
                                                 .map(Node::status)
                                                 .map(Status::osVersion)
                                                 .anyMatch(osVersion -> osVersion.current().isPresent() &&
-                                                                       osVersion.current().get().getMajor() < target.getMajor());
+                                                                       osVersion.current().get().getMajor() < target.get().getMajor());
         if (rebuildRequired) {
             return new RebuildingOsUpgrader(nodeRepository);
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 3659166c9da..efd76187bc6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -161,7 +161,10 @@ class NodesResponse extends SlimeJsonResponse {
         object.setLong("rebootGeneration", node.status().reboot().wanted());
         object.setLong("currentRebootGeneration", node.status().reboot().current());
         node.status().osVersion().current().ifPresent(version -> object.setString("currentOsVersion", version.toFullString()));
-        node.status().osVersion().wanted().ifPresent(version -> object.setString("wantedOsVersion", version.toFullString()));
+        node.status().osVersion().wanted().ifPresent(version -> {
+            object.setString("wantedOsVersion", version.toFullString());
+            object.setBool("deferOsUpgrade", !nodeRepository.osVersions().canUpgrade(node));
+        });
         node.status().firmwareVerifiedAt().ifPresent(instant -> object.setLong("currentFirmwareCheck", instant.toEpochMilli()));
         if (node.type().isHost())
             nodeRepository.firmwareChecks().requiredAfter().ifPresent(after -> object.setLong("wantedFirmwareCheck", after.toEpochMilli()));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
index b885f7bd7fc..287db73faf6 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "currentOsVersion": "7.5.2",
   "wantedOsVersion": "7.5.2",
+  "deferOsUpgrade": false,
   "failCount": 0,
   "wantToRetire": false,
   "preferToRetire": false,