aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-07-07 16:38:02 +0200
committerMartin Polden <mpolden@mpolden.no>2022-07-08 09:07:47 +0200
commit7a45d6c3b6d4c5e73ee50f518e6f76543b0b537b (patch)
tree39627a262910389c498550dacf8958693d9e6e34 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi
parentb849c9f421d7b0e062a7cc503a3ac3ad0782e320 (diff)
Add deferOsUpgrade field to node response
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java5
1 files changed, 4 insertions, 1 deletions
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()));