diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-08-09 14:28:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-09 14:28:38 +0200 |
commit | 621979342fbdae2197ea414eea201c64851cedc5 (patch) | |
tree | c351af48195f82d0b7dddb8af0eaf378bee9495b | |
parent | 6bac2ae7310713e1558f1f9d1de4101f443cff4b (diff) | |
parent | 4878a44458ad90b2009db3b8b9d74b9afee64ae8 (diff) |
Merge pull request #27998 from vespa-engine/freva/handle-all-cases
Handle default case and remove handling for provisioned state
2 files changed, 1 insertions, 15 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index c7c2686fde7..7fc248024c3 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -546,7 +546,6 @@ public class NodeAgentImpl implements NodeAgent { suspendedInOrchestrator = false; } } - case provisioned -> nodeRepository.setNodeState(context.hostname().value(), NodeState.ready); case dirty -> { removeContainerIfNeededUpdateContainerState(context, container); context.log(logger, "State is " + node.state() + ", will delete application storage and mark node as ready"); @@ -556,6 +555,7 @@ public class NodeAgentImpl implements NodeAgent { updateNodeRepoWithCurrentAttributes(context, Optional.empty()); nodeRepository.setNodeState(context.hostname().value(), NodeState.ready); } + default -> throw ConvergenceException.ofError("Unexpected state " + node.state().name()); } } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index 0913e1d040a..ef4d6d849f6 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -487,20 +487,6 @@ public class NodeAgentImplTest { } @Test - void provisionedNodeIsMarkedAsReady() { - final NodeSpec node = nodeBuilder(NodeState.provisioned) - .wantedDockerImage(dockerImage) - .build(); - - NodeAgentContext context = createContext(node); - NodeAgentImpl nodeAgent = makeNodeAgent(null, false); - when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node)); - - nodeAgent.doConverge(context); - verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.ready)); - } - - @Test void testRestartDeadContainerAfterNodeAdminRestart() { final NodeSpec node = nodeBuilder(NodeState.active) .currentDockerImage(dockerImage).wantedDockerImage(dockerImage) |