Skip to content

Commit df73595

Browse files
Fix SearchCancellationIT failures (#101777) (#102009)
We need at least two data nodes in this test, otherwise we are not guaranteed to get two concurrently executing shard query requests because max concurrency could be 1. closes #101739 #99929
1 parent 6784f54 commit df73595

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.elasticsearch.tasks.TaskCancelledException;
3333
import org.elasticsearch.test.AbstractSearchCancellationTestCase;
3434
import org.elasticsearch.test.ESIntegTestCase;
35-
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
3635
import org.elasticsearch.transport.TransportService;
3736

3837
import java.util.ArrayList;
@@ -231,11 +230,10 @@ public void testCancelMultiSearch() throws Exception {
231230
}
232231
}
233232

234-
@TestIssueLogging(
235-
value = "org.elasticsearch.action.search:TRACE,org.elasticsearch.search:TRACE," + "org.elasticsearch.tasks:TRACE",
236-
issueUrl = "https://github.com/elastic/elasticsearch/issues/99929"
237-
)
238233
public void testCancelFailedSearchWhenPartialResultDisallowed() throws Exception {
234+
// Have at least two nodes so that we have parallel execution of two request guaranteed even if max concurrent requests per node
235+
// are limited to 1
236+
internalCluster().ensureAtLeastNumDataNodes(2);
239237
int numberOfShards = between(2, 5);
240238
createIndex("test", numberOfShards, 0);
241239
indexTestData();

0 commit comments

Comments
 (0)