Skip to content

Commit

Permalink
[TEST] Increase TransportSearchActionTests timeouts
Browse files Browse the repository at this point in the history 
We have recently gone from 1 second to 5, and we still had some failures. Note that testCollectSearchShards was recently moved and reworked from RemoteClusterServiceTests to TransportSearchActionTests.
Increasing this one last time considerably, which should help understanding if failures are caused by test infra slowness or a bug.

Relates to elastic#33852
  • Loading branch information
@javanna
javanna committed Feb 1, 2019
1 parent 1fa413a commit 22f6f5e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ public void onNodeDisconnected(DiscoveryNode node) {

//give transport service enough time to realize that the node is down, and to notify the connection listeners
//so that RemoteClusterConnection is left with no connected nodes, hence it will retry connecting next
assertTrue(disconnectedLatch.await(5, TimeUnit.SECONDS));
assertTrue(disconnectedLatch.await(30, TimeUnit.SECONDS));

service.clearAllRules();
if (randomBoolean()) {
Expand Down Expand Up @@ -610,7 +610,7 @@ public void testCollectSearchShards() throws Exception {
TransportSearchAction.collectSearchShards(IndicesOptions.lenientExpandOpen(), null, null, skippedClusters,
remoteIndicesByCluster, remoteClusterService, threadPool,
new LatchedActionListener<>(ActionListener.wrap(response::set, e -> fail("no failures expected")), latch));
awaitLatch(latch, 5, TimeUnit.SECONDS);
awaitLatch(latch, 30, TimeUnit.SECONDS);
assertEquals(0, skippedClusters.get());
assertNotNull(response.get());
Map<String, ClusterSearchShardsResponse> map = response.get();
Expand All @@ -629,7 +629,7 @@ public void testCollectSearchShards() throws Exception {
TransportSearchAction.collectSearchShards(IndicesOptions.lenientExpandOpen(), "index_not_found", null, skippedClusters,
remoteIndicesByCluster, remoteClusterService, threadPool,
new LatchedActionListener<>(ActionListener.wrap(r -> fail("no response expected"), failure::set), latch));
awaitLatch(latch, 5, TimeUnit.SECONDS);
awaitLatch(latch, 30, TimeUnit.SECONDS);
assertEquals(0, skippedClusters.get());
assertNotNull(failure.get());
assertThat(failure.get(), instanceOf(RemoteTransportException.class));
Expand Down Expand Up @@ -667,7 +667,7 @@ public void onNodeDisconnected(DiscoveryNode node) {
TransportSearchAction.collectSearchShards(IndicesOptions.lenientExpandOpen(), null, null, skippedClusters,
remoteIndicesByCluster, remoteClusterService, threadPool,
new LatchedActionListener<>(ActionListener.wrap(r -> fail("no response expected"), failure::set), latch));
awaitLatch(latch, 5, TimeUnit.SECONDS);
awaitLatch(latch, 30, TimeUnit.SECONDS);
assertEquals(0, skippedClusters.get());
assertNotNull(failure.get());
assertThat(failure.get(), instanceOf(RemoteTransportException.class));
Expand All @@ -687,7 +687,7 @@ public void onNodeDisconnected(DiscoveryNode node) {
TransportSearchAction.collectSearchShards(IndicesOptions.lenientExpandOpen(), null, null, skippedClusters,
remoteIndicesByCluster, remoteClusterService, threadPool,
new LatchedActionListener<>(ActionListener.wrap(response::set, e -> fail("no failures expected")), latch));
awaitLatch(latch, 5, TimeUnit.SECONDS);
awaitLatch(latch, 30, TimeUnit.SECONDS);
assertNotNull(response.get());
Map<String, ClusterSearchShardsResponse> map = response.get();
assertEquals(numClusters - disconnectedNodesIndices.size(), map.size());
Expand All @@ -704,7 +704,7 @@ public void onNodeDisconnected(DiscoveryNode node) {

//give transport service enough time to realize that the node is down, and to notify the connection listeners
//so that RemoteClusterConnection is left with no connected nodes, hence it will retry connecting next
assertTrue(disconnectedLatch.await(5, TimeUnit.SECONDS));
assertTrue(disconnectedLatch.await(30, TimeUnit.SECONDS));

service.clearAllRules();
if (randomBoolean()) {
Expand All @@ -722,7 +722,7 @@ public void onNodeDisconnected(DiscoveryNode node) {
TransportSearchAction.collectSearchShards(IndicesOptions.lenientExpandOpen(), null, null, skippedClusters,
remoteIndicesByCluster, remoteClusterService, threadPool,
new LatchedActionListener<>(ActionListener.wrap(response::set, e -> fail("no failures expected")), latch));
awaitLatch(latch, 5, TimeUnit.SECONDS);
awaitLatch(latch, 30, TimeUnit.SECONDS);
assertEquals(0, skippedClusters.get());
assertNotNull(response.get());
Map<String, ClusterSearchShardsResponse> map = response.get();
Expand Down

0 comments on commit 22f6f5e

Please sign in to comment.