diff options
Diffstat (limited to 'node-admin')
2 files changed, 7 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java index 415a8b6f438..a2312a23925 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java @@ -36,6 +36,7 @@ import java.util.Optional; import java.util.concurrent.Phaser; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; import static org.mockito.ArgumentMatchers.any; @@ -98,6 +99,10 @@ public class ContainerTester implements AutoCloseable { } @Override public void stopForHostSuspension(NodeAgentContext context) { super.stopForHostSuspension(context); + phaser.arriveAndAwaitAdvance(); + } + @Override public void stopForRemoval(NodeAgentContext context) { + super.stopForRemoval(context); phaser.arriveAndDeregister(); } }; @@ -109,7 +114,7 @@ public class ContainerTester implements AutoCloseable { loopThread = new Thread(() -> { nodeAdminStateUpdater.start(); - while ( !phaser.isTerminated()) { + while ( ! phaser.isTerminated()) { try { nodeAdminStateUpdater.converge(wantedState); } catch (RuntimeException e) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java index f3635be1b4b..277f9906dde 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RebootTest.java @@ -35,8 +35,7 @@ public class RebootTest { tester.setWantedState(NodeAdminStateUpdater.State.SUSPENDED); - tester.inOrder(tester.orchestrator).suspend( - eq(HOST_HOSTNAME.value()), eq(List.of(hostname, HOST_HOSTNAME.value()))); + tester.inOrder(tester.orchestrator).suspend(eq(HOST_HOSTNAME.value()), eq(List.of(hostname, HOST_HOSTNAME.value()))); tester.inOrder(tester.containerOperations).stopServices(containerMatcher(host1)); assertTrue(tester.nodeAdmin.setFrozen(true)); } |