Skip to content

Fix flaky tests in TestReconfiguration #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kezhuw merged 1 commit into from
Jul 4, 2025
+15 −9
Merged

Fix flaky tests in TestReconfiguration #1271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,14 @@ public void testAddWithoutEnsembleTracker() throws Exception {

@Test
public void testAdd() throws Exception {
try (CuratorFramework client = newClient()) {
CountDownLatch ensembleLatch = new CountDownLatch(1);
try (CuratorFramework client = newClient(cluster.getConnectString(), ensembleLatch)) {
client.start();

QuorumVerifier oldConfig = toQuorumVerifier(client.getConfig().forEnsemble());
assertConfig(oldConfig, cluster.getInstances());

CountDownLatch latch = setChangeWaiter(client);
CountDownLatch eventLatch = setChangeWaiter(client);
try (TestingCluster newCluster = new TestingCluster(TestingCluster.makeSpecs(1, false))) {
newCluster.start();

Expand All @@ -271,7 +272,8 @@ public void testAdd() throws Exception {
.fromConfig(oldConfig.getVersion())
.forEnsemble();

assertTrue(timing.awaitLatch(latch));
assertTrue(timing.awaitLatch(eventLatch));
assertTrue(timing.awaitLatch(ensembleLatch));

byte[] newConfigData = client.getConfig().forEnsemble();
QuorumVerifier newConfig = toQuorumVerifier(newConfigData);
Expand All @@ -286,13 +288,14 @@ public void testAdd() throws Exception {

@Test
public void testAddAsync() throws Exception {
try (CuratorFramework client = newClient()) {
CountDownLatch ensembleLatch = new CountDownLatch(1);
try (CuratorFramework client = newClient(cluster.getConnectString(), ensembleLatch)) {
client.start();

QuorumVerifier oldConfig = toQuorumVerifier(client.getConfig().forEnsemble());
assertConfig(oldConfig, cluster.getInstances());

CountDownLatch latch = setChangeWaiter(client);
CountDownLatch eventLatch = setChangeWaiter(client);
try (TestingCluster newCluster = new TestingCluster(TestingCluster.makeSpecs(1, false))) {
newCluster.start();

Expand All @@ -312,7 +315,8 @@ public void processResult(CuratorFramework client, CuratorEvent event) throws Ex
.forEnsemble();

assertTrue(timing.awaitLatch(callbackLatch));
assertTrue(timing.awaitLatch(latch));
assertTrue(timing.awaitLatch(eventLatch));
assertTrue(timing.awaitLatch(ensembleLatch));

byte[] newConfigData = client.getConfig().forEnsemble();
QuorumVerifier newConfig = toQuorumVerifier(newConfigData);
Expand All @@ -327,13 +331,14 @@ public void processResult(CuratorFramework client, CuratorEvent event) throws Ex

@Test
public void testAddAndRemove() throws Exception {
try (CuratorFramework client = newClient()) {
CountDownLatch ensembleLatch = new CountDownLatch(1);
try (CuratorFramework client = newClient(cluster.getConnectString(), ensembleLatch)) {
client.start();

QuorumVerifier oldConfig = toQuorumVerifier(client.getConfig().forEnsemble());
assertConfig(oldConfig, cluster.getInstances());

CountDownLatch latch = setChangeWaiter(client);
CountDownLatch eventLatch = setChangeWaiter(client);

try (TestingCluster newCluster = new TestingCluster(TestingCluster.makeSpecs(1, false))) {
newCluster.start();
Expand All @@ -355,7 +360,8 @@ public void testAddAndRemove() throws Exception {
.fromConfig(oldConfig.getVersion())
.forEnsemble();

assertTrue(timing.awaitLatch(latch));
assertTrue(timing.awaitLatch(eventLatch));
assertTrue(timing.awaitLatch(ensembleLatch));

byte[] newConfigData = client.getConfig().forEnsemble();
QuorumVerifier newConfig = toQuorumVerifier(newConfigData);
Expand Down