Rename tests, grab numShards differently

Author: benchaplin

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/SearchErrorTraceIT.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.action.search.MultiSearchRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.Request;
-import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.plugins.Plugin;
@@ -62,17 +61,14 @@ public void resetSettings() {
         updateClusterSettings(Settings.builder().putNull(SearchService.BATCHED_QUERY_PHASE.getKey()));
     }
 
-    private int setupIndexWithDocs() {
-        int numShards = numberOfShards();
-        createIndex("test1", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards).build());
-        createIndex("test2", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards).build());
+    private void setupIndexWithDocs() {
+        createIndex("test1", "test2");
         indexRandom(
             true,
             prepareIndex("test1").setId("1").setSource("field", "foo"),
             prepareIndex("test2").setId("10").setSource("field", 5)
         );
         refresh();
-        return numShards;
     }
 
     public void testSearchFailingQueryErrorTraceDefault() throws IOException {
@@ -131,8 +127,8 @@ public void testSearchFailingQueryErrorTraceFalse() throws IOException {
         assertFalse(hasStackTrace.getAsBoolean());
     }
 
-    public void testNoLoggingInSearchFailingQueryErrorTraceTrue() throws IOException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeDoesNotLogStackTraceWhenErrorTraceTrue() throws IOException {
+        setupIndexWithDocs();
 
         Request searchRequest = new Request("POST", "/_search");
         searchRequest.setJsonEntity("""
@@ -147,6 +143,7 @@ public void testNoLoggingInSearchFailingQueryErrorTraceTrue() throws IOException
             """);
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addUnseenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
@@ -156,8 +153,8 @@ public void testNoLoggingInSearchFailingQueryErrorTraceTrue() throws IOException
         }
     }
 
-    public void testLoggingInSearchFailingQueryErrorTraceFalse() throws IOException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeLogsStackTraceWhenErrorTraceFalseOrEmpty() throws IOException {
+        setupIndexWithDocs();
 
         Request searchRequest = new Request("POST", "/_search");
         searchRequest.setJsonEntity("""
@@ -172,6 +169,7 @@ public void testLoggingInSearchFailingQueryErrorTraceFalse() throws IOException
             """);
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addSeenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
@@ -235,8 +233,8 @@ public void testMultiSearchFailingQueryErrorTraceFalse() throws IOException {
         assertFalse(hasStackTrace.getAsBoolean());
     }
 
-    public void testLoggingInMultiSearchFailingQueryErrorTraceTrue() throws IOException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeDoesNotLogStackTraceWhenErrorTraceTrueMultiSearch() throws IOException {
+        setupIndexWithDocs();
 
         XContentType contentType = XContentType.JSON;
         MultiSearchRequest multiSearchRequest = new MultiSearchRequest().add(
@@ -251,6 +249,7 @@ public void testLoggingInMultiSearchFailingQueryErrorTraceTrue() throws IOExcept
         searchRequest.addParameter("error_trace", "true");
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addUnseenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
@@ -259,8 +258,8 @@ public void testLoggingInMultiSearchFailingQueryErrorTraceTrue() throws IOExcept
         }
     }
 
-    public void testLoggingInMultiSearchFailingQueryErrorTraceFalse() throws IOException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeLogsStackTraceWhenErrorTraceFalseOrEmptyMultiSearch() throws IOException {
+        setupIndexWithDocs();
 
         XContentType contentType = XContentType.JSON;
         MultiSearchRequest multiSearchRequest = new MultiSearchRequest().add(
@@ -278,6 +277,7 @@ public void testLoggingInMultiSearchFailingQueryErrorTraceFalse() throws IOExcep
         }
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addSeenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 

x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchErrorTraceIT.java

@@ -63,17 +63,14 @@ public void resetSettings() {
         updateClusterSettings(Settings.builder().putNull(SearchService.BATCHED_QUERY_PHASE.getKey()));
     }
 
-    private int setupIndexWithDocs() {
-        int numShards = numberOfShards();
-        createIndex("test1", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards).build());
-        createIndex("test2", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards).build());
+    private void setupIndexWithDocs() {
+        createIndex("test1", "test2");
         indexRandom(
             true,
             prepareIndex("test1").setId("1").setSource("field", "foo"),
             prepareIndex("test2").setId("10").setSource("field", 5)
         );
         refresh();
-        return numShards;
     }
 
     public void testAsyncSearchFailingQueryErrorTraceDefault() throws IOException, InterruptedException {
@@ -158,8 +155,8 @@ public void testAsyncSearchFailingQueryErrorTraceFalse() throws IOException, Int
         assertFalse(transportMessageHasStackTrace.getAsBoolean());
     }
 
-    public void testLoggingInAsyncSearchFailingQueryErrorTraceTrue() throws IOException, InterruptedException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeDoesNotLogStackTraceWhenErrorTraceTrue() throws IOException, InterruptedException {
+        setupIndexWithDocs();
 
         Request searchRequest = new Request("POST", "/_async_search");
         searchRequest.setJsonEntity("""
@@ -177,6 +174,7 @@ public void testLoggingInAsyncSearchFailingQueryErrorTraceTrue() throws IOExcept
         searchRequest.addParameter("wait_for_completion_timeout", "0ms");
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addUnseenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);
 
@@ -193,8 +191,9 @@ public void testLoggingInAsyncSearchFailingQueryErrorTraceTrue() throws IOExcept
         }
     }
 
-    public void testLoggingInAsyncSearchFailingQueryErrorTraceFalse() throws IOException, InterruptedException {
-        int numShards = setupIndexWithDocs();
+    public void testDataNodeLogsStackTraceWhenErrorTraceFalseOrEmpty() throws IOException, InterruptedException {
+        setupIndexWithDocs();
+
         // error_trace defaults to false so we can test both cases with some randomization
         final boolean defineErrorTraceFalse = randomBoolean();
 
@@ -216,6 +215,7 @@ public void testLoggingInAsyncSearchFailingQueryErrorTraceFalse() throws IOExcep
         searchRequest.addParameter("wait_for_completion_timeout", "0ms");
 
         String errorTriggeringIndex = "test2";
+        int numShards = getNumShards(errorTriggeringIndex).numPrimaries;
         try (var mockLog = MockLog.capture(SearchService.class)) {
             ErrorTraceHelper.addSeenLoggingExpectations(numShards, mockLog, errorTriggeringIndex);