aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-04-16 09:03:20 +0200
committerMartin Polden <mpolden@mpolden.no>2021-04-16 09:03:20 +0200
commitd254bb8e4308ee0b850b1ba529c3dcca747154dc (patch)
tree6fd114270d64b94c6962ba580df2aa21c9db602f /node-admin
parent96d0ecfc88a765be9d6927ff559e9d7f6c8cc327 (diff)
Move provisioned nodes to ready instead of dirty
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java4
2 files changed, 3 insertions, 3 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 e335e66c1c1..efc94d11033 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
@@ -505,7 +505,7 @@ public class NodeAgentImpl implements NodeAgent {
}
break;
case provisioned:
- nodeRepository.setNodeState(context.hostname().value(), NodeState.dirty);
+ nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
break;
case dirty:
removeContainerIfNeededUpdateContainerState(context, container);
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 2e421945f4f..9cedf7777eb 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
@@ -467,7 +467,7 @@ public class NodeAgentImplTest {
}
@Test
- public void provisionedNodeIsMarkedAsDirty() {
+ public void provisionedNodeIsMarkedAsReady() {
final NodeSpec node = nodeBuilder(NodeState.provisioned)
.wantedDockerImage(dockerImage)
.build();
@@ -477,7 +477,7 @@ public class NodeAgentImplTest {
when(nodeRepository.getOptionalNode(hostName)).thenReturn(Optional.of(node));
nodeAgent.doConverge(context);
- verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.dirty));
+ verify(nodeRepository, times(1)).setNodeState(eq(hostName), eq(NodeState.ready));
}
@Test