diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-10-10 22:12:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-10 22:12:08 +0200 |
| commit | abac62c851c27907c7a77c6ca5c7566fdbe64b75 (patch) | |
| tree | c7497e24345fb7c6828c88a83fe0d152630150b6 | |
| parent | 6cc74c4a38a2e6d1c9fcda94b1ef5631c4275f36 (diff) | |
| parent | 656dcec14412d6d9cf6fec9cd11b6901d52693a9 (diff) | |
Merge pull request #28859 from vespa-engine/jonmv/resume-while-boosting-for-first-time-deploymentsv8.241.13
Verify warmup resume only initially in unit test
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java | 18 |
1 files changed, 18 insertions, 0 deletions
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 f1d2580b1d7..709326cc3b8 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 @@ -731,6 +731,24 @@ public class NodeAgentImplTest { } @Test + void resume_during_first_warmup() { + InOrder inOrder = inOrder(orchestrator, nodeRepository); + NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true, Duration.ofSeconds(30)); + mockGetContainer(dockerImage, ContainerResources.from(2, 2, 16), true); + + // Warmup period prevents resume when node has a current docker image, i.e., already existed. + nodeAgent.converge(createContext(nodeBuilder(NodeState.active).wantedDockerImage(dockerImage).currentDockerImage(dockerImage).build())); + inOrder.verifyNoMoreInteractions(); + + nodeAgent.converge(createContext(nodeBuilder(NodeState.active).wantedDockerImage(dockerImage).build())); + inOrder.verify(nodeRepository).updateNodeAttributes(eq(hostName), eq(new NodeAttributes().withDockerImage(dockerImage) + .withRebootGeneration(0) + .withVespaVersion(Version.fromString("7.1.1")))); + inOrder.verifyNoMoreInteractions(); + } + + + @Test void drop_all_documents() { InOrder inOrder = inOrder(orchestrator, nodeRepository); BiFunction<NodeState, DropDocumentsReport, NodeSpec> specBuilder = (state, report) -> (report == null ? |