summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/ContainerTester.java9
1 files changed, 3 insertions, 6 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 c5ab858220f..8d3df700c2d 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
@@ -93,16 +93,13 @@ public class ContainerTester implements AutoCloseable {
storageMaintainer, flagSource,
Collections.emptyList(), Optional.empty(), Optional.empty(), clock, Duration.ofSeconds(-1),
VespaServiceDumper.DUMMY_INSTANCE) {
- AtomicBoolean stopped = new AtomicBoolean();
@Override public void converge(NodeAgentContext context) {
super.converge(context);
phaser.arriveAndAwaitAdvance();
}
@Override public void stopForHostSuspension(NodeAgentContext context) {
- if (stopped.compareAndSet(false, true)) {
- super.stopForHostSuspension(context);
- phaser.arriveAndDeregister();
- }
+ super.stopForHostSuspension(context);
+ phaser.arriveAndAwaitAdvance();
}
};
nodeAdmin = new NodeAdminImpl(nodeAgentFactory, metrics, clock, Duration.ofMillis(10), Duration.ZERO);
@@ -113,7 +110,7 @@ public class ContainerTester implements AutoCloseable {
loopThread = new Thread(() -> {
nodeAdminStateUpdater.start();
- while ( !phaser.isTerminated()) {
+ while ( ! phaser.isTerminated()) {
try {
nodeAdminStateUpdater.converge(wantedState);
} catch (RuntimeException e) {