diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-01-06 14:32:27 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-01-06 14:32:27 +0100 |
| commit | 25bdcc87f06449e94888ecd8f9c27cd71fad3195 (patch) | |
| tree | 900bff7205767222665480d4e87033d025b8a0ab /controller-server | |
| parent | 21da42e562beb1cf132118d47170e65b4750efee (diff) | |
Serialize null OrchestratorStatus in NodeRepositoryNode in patch to null/nothing
Diffstat (limited to 'controller-server')
2 files changed, 6 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 373967df6c4..e789974ea13 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -540,6 +540,7 @@ public class InternalStepRunner implements StepRunner { switch (state) { case allowedDown: return "allowed to be DOWN"; case expectedUp: return "expected to be UP"; + case permanentlyDown: return "permanently DOWN"; case unorchestrated: return "unorchestrated"; default: return state.name(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 22dd098adfb..0dff1600751 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -723,13 +723,16 @@ public class ApplicationApiHandler extends LoggingRequestHandler { } } - private static String valueOf(Node.ServiceState state) { + static String valueOf(Node.ServiceState state) { switch (state) { case expectedUp: return "expectedUp"; case allowedDown: return "allowedDown"; + case permanentlyDown: return "permanentlyDown"; case unorchestrated: return "unorchestrated"; - default: throw new IllegalArgumentException("Unexpected node state '" + state + "'."); + case unknown: break; } + + return "unknown"; } private static String valueOf(Node.ClusterType type) { |