diff options
author | jonmv <venstad@gmail.com> | 2023-02-09 10:56:46 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-02-09 10:56:46 +0100 |
commit | 6c221ee0ab841e64ef5cd317dfc363998a8c7454 (patch) | |
tree | 5e4c661d33e77589e323cc0ae01aa613c36b85b1 /zookeeper-server | |
parent | 7cb3576347f6cbaf96a4ba558b595654f99c37c1 (diff) |
Wait only at start, for runner
Diffstat (limited to 'zookeeper-server')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java index 760c326cf5d..697fba3b4c4 100644 --- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java +++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java @@ -103,7 +103,7 @@ public class ReconfigurerTest { @After public void stopReconfigurer() { - reconfigurer.shutdown(); + reconfigurer.deconstruct(); } private ZookeeperServerConfig createConfig(int numberOfServers, boolean dynamicReconfiguration, int... retiredIndices) { @@ -155,7 +155,7 @@ public class ReconfigurerTest { void startOrReconfigure(ZookeeperServerConfig newConfig) { serverPeer = startOrReconfigure(newConfig, this, MockQuorumPeer::new); - phaser.arriveAndDeregister(); + phaser.arriveAndAwaitAdvance(); // Let runner thread see us setting the peer—used below in start(Path)—the first time. } String connectionSpec() { @@ -172,12 +172,12 @@ public class ReconfigurerTest { @Override public void shutdown() { - phaser.arriveAndAwaitAdvance(); - serverPeer.shutdown(Duration.ofSeconds(1)); } + serverPeer.shutdown(Duration.ofSeconds(1)); + } @Override public void start(Path configFilePath) { - phaser.arriveAndAwaitAdvance(); + phaser.awaitAdvance(phaser.arriveAndDeregister()); serverPeer.start(configFilePath); } |