Skip to content

Remove race in ensure remote connection test #72961

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
merged 1 commit into from
Jun 9, 2021
Merged

Remove race in ensure remote connection test #72961

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
11 changes: 6 additions & 5 deletions server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ public void testEnsureConnected() throws IOException, InterruptedException {
assertFalse(connectionManager.nodeConnected(seedNode));
assertFalse(connectionManager.nodeConnected(discoverableNode));
assertTrue(connection.assertNoRunningConnections());
CountDownLatch latch = new CountDownLatch(1);
CountDownLatch firstLatch = new CountDownLatch(1);
connection.ensureConnected(new LatchedActionListener<>(new ActionListener<Void>() {
@Override
public void onResponse(Void aVoid) {
Expand All @@ -1180,12 +1180,13 @@ public void onResponse(Void aVoid) {
public void onFailure(Exception e) {
throw new AssertionError(e);
}
}, latch));
latch.await();
}, firstLatch));
firstLatch.await();
assertTrue(connectionManager.nodeConnected(seedNode));
assertTrue(connectionManager.nodeConnected(discoverableNode));
assertTrue(connection.assertNoRunningConnections());

CountDownLatch secondLatch = new CountDownLatch(1);
// exec again we are already connected
connection.ensureConnected(new LatchedActionListener<>(new ActionListener<Void>() {
@Override
Expand All @@ -1196,8 +1197,8 @@ public void onResponse(Void aVoid) {
public void onFailure(Exception e) {
throw new AssertionError(e);
}
}, latch));
latch.await();
}, secondLatch));
secondLatch.await();
assertTrue(connectionManager.nodeConnected(seedNode));
assertTrue(connectionManager.nodeConnected(discoverableNode));
assertTrue(connection.assertNoRunningConnections());
Expand Down