diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-01-07 08:12:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 08:12:00 +0100 |
| commit | 26b2ff3d875d1f1814cf643f3e83024bac1282dc (patch) | |
| tree | 11222044ef5363bfba579f0af68f4deda17a33ae /controller-server | |
| parent | 20bbc25989a50c72bec76c86dfd0426ac1b923ce (diff) | |
| parent | 25bdcc87f06449e94888ecd8f9c27cd71fad3195 (diff) | |
Merge pull request #15924 from vespa-engine/revert-15923-revert-15911-hakonhall/make-clients-use-orchestratorstatus-instead-of-allowedtobedown
Make clients use orchestratorStatus instead of allowedToBeDown, try 2 [run-systemtest]
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) { |