Skip to content

Commit b3eb225

Browse files
Stabilize test
1 parent 2b64312 commit b3eb225

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,19 +1363,20 @@ public void testLazyResolveTransportAddress() throws Exception {
13631363
try (MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, Version.CURRENT, threadPool, null)) {
13641364
service.start();
13651365
service.acceptIncomingRequests();
1366-
AtomicInteger resolveCount = new AtomicInteger(0);
1366+
CountDownLatch multipleResolveLatch = new CountDownLatch(2);
13671367
Supplier<DiscoveryNode> seedSupplier = () -> {
1368-
resolveCount.incrementAndGet();
1368+
multipleResolveLatch.countDown();
13691369
return seedNode;
13701370
};
13711371
try (RemoteClusterConnection connection = new RemoteClusterConnection(Settings.EMPTY, "test-cluster",
13721372
Arrays.asList(seedSupplier), service, Integer.MAX_VALUE, n -> true)) {
13731373
updateSeedNodes(connection, Arrays.asList(seedSupplier));
1374-
// Closing connection leads to RemoteClusterConnection.ConnectHandler.collectRemoteNodes
1374+
// Closing connections leads to RemoteClusterConnection.ConnectHandler.collectRemoteNodes
13751375
// being called again so we try to resolve the same seed node's host twice
13761376
discoverableTransport.close();
1377+
seedTransport.close();
1378+
assertTrue(multipleResolveLatch.await(30L, TimeUnit.SECONDS));
13771379
}
1378-
assertEquals(2, resolveCount.get());
13791380
}
13801381
}
13811382
}

0 commit comments

Comments
 (0)