diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-11 14:41:39 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-11 14:41:39 +0100 |
| commit | f40b14666735820d6276ba453ec6fa3b72a91720 (patch) | |
| tree | 15e6b4995037826b5193b65ad9362c6d6d11b16a /node-admin/src/test/java | |
| parent | a62dedb67dfd2edc8c5b6b3a70f605a4918d4313 (diff) | |
Update rebooted event for nodes everytime container is recreated
Diffstat (limited to 'node-admin/src/test/java')
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java | 8 |
1 files changed, 4 insertions, 4 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 29411b8069f..13f101be6e8 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 @@ -187,7 +187,7 @@ public class NodeAgentImplTest { inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(healthChecker, times(1)).verifyHealth(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion())); + hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()).withRebootGeneration(0)); inOrder.verify(orchestrator, never()).resume(hostName); } @@ -285,7 +285,7 @@ public class NodeAgentImplTest { inOrder.verify(containerOperations).removeContainer(eq(secondContext), any()); inOrder.verify(containerOperations, never()).updateContainer(any(), any(), any()); inOrder.verify(containerOperations, never()).restartVespa(any()); - inOrder.verify(nodeRepository).updateNodeAttributes(eq(hostName), eq(new NodeAttributes().withRestartGeneration(2))); + inOrder.verify(nodeRepository).updateNodeAttributes(eq(hostName), eq(new NodeAttributes().withRestartGeneration(2).withRebootGeneration(0))); nodeAgent.doConverge(secondContext); inOrder.verify(orchestrator).resume(any(String.class)); @@ -610,7 +610,7 @@ public class NodeAgentImplTest { inOrder.verify(aclMaintainer, times(1)).converge(eq(context)); inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion())); + hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()).withRebootGeneration(0)); inOrder.verify(orchestrator).resume(hostName); } @@ -765,7 +765,7 @@ public class NodeAgentImplTest { Optional.of(new Container( containerId, ContainerName.fromHostname(hostName), - Instant.EPOCH, + clock.instant(), isRunning ? Container.State.running : Container.State.exited, "image-id-1", dockerImage, |