diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-09-16 15:44:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 15:44:09 +0200 |
| commit | 80749b12c4a2c58c011a257d2b94a4ac8eba49f2 (patch) | |
| tree | e8626a7a251e8020060d3094ac76bfece00f1d65 /node-repository | |
| parent | eaea924b64fa29a86373b395275bfde849a90b12 (diff) | |
| parent | b8960346769a3ca15187a2a30a8e78b07bc611d1 (diff) | |
Merge pull request #14425 from vespa-engine/hakonhall/expose-orchestratorstatus-from-node-repo
Expose orchestratorStatus from node repo
Diffstat (limited to 'node-repository')
2 files changed, 6 insertions, 0 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 3efd6e417cb..8e3ae6358df 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 @@ -19,6 +19,7 @@ import com.yahoo.vespa.hosted.provision.node.History; import com.yahoo.vespa.hosted.provision.node.filter.NodeFilter; import com.yahoo.vespa.orchestrator.Orchestrator; import com.yahoo.vespa.orchestrator.status.HostInfo; +import com.yahoo.vespa.orchestrator.status.HostStatus; import java.io.IOException; import java.io.OutputStream; @@ -164,6 +165,10 @@ class NodesResponse extends HttpResponse { orchestrator.apply(new HostName(node.hostname())) .ifPresent(info -> { object.setBool("allowedToBeDown", info.status().isSuspended()); + // TODO: Remove allowedToBeDown as a special-case of orchestratorHostStatus + if (info.status() != HostStatus.NO_REMARKS) { + object.setString("orchestratorStatus", info.status().asString()); + } info.suspendedSince().ifPresent(since -> object.setLong("suspendedSinceMillis", since.toEpochMilli())); }); }); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json index af3552945d9..7ca5048ac3b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json @@ -28,6 +28,7 @@ "wantedVespaVersion": "6.42.0", "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any" }, "allowedToBeDown": true, + "orchestratorStatus": "ALLOWED_TO_BE_DOWN", "suspendedSinceMillis": 0, "rebootGeneration": 3, "currentRebootGeneration": 1, |