Merge remote-tracking branch 'upstream/main' into enhancement/add_ilm_delete_index

Author: ShourieG

muted-tests.yml

@@ -500,12 +500,6 @@ tests:
 - class: org.elasticsearch.test.rest.yaml.MDPYamlTestSuiteIT
   method: test {yaml=mdp/10_basic/Index using shared data path}
   issue: https://github.com/elastic/elasticsearch/issues/132223
-- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
-  method: testTermsQuery
-  issue: https://github.com/elastic/elasticsearch/issues/132225
-- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
-  method: testTermsQuery
-  issue: https://github.com/elastic/elasticsearch/issues/132226
 - class: org.elasticsearch.xpack.sql.qa.mixed_node.SqlCompatIT
   method: testNullsOrderWithMissingOrderSupportQueryingNewNode
   issue: https://github.com/elastic/elasticsearch/issues/132249
@@ -533,9 +527,6 @@ tests:
 - class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusReindexedLogsDbChallengeRestIT
   method: testTermsQuery
   issue: https://github.com/elastic/elasticsearch/issues/132337
-- class: org.elasticsearch.search.suggest.phrase.PhraseSuggesterIT
-  method: testPhraseSuggestionWithNgramOnlyAnalyzerThrowsException
-  issue: https://github.com/elastic/elasticsearch/issues/132347
 - class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryIT
   method: testBadAsyncId
   issue: https://github.com/elastic/elasticsearch/issues/132353

server/src/internalClusterTest/java/org/elasticsearch/search/suggest/phrase/PhraseSuggesterIT.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.search.suggest.phrase;
 
+import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.ShardSearchFailure;
 import org.elasticsearch.common.settings.Settings;
@@ -49,15 +50,25 @@ public void testPhraseSuggestionWithNgramOnlyAnalyzerThrowsException() throws IO
         // 4. NoisyChannelSpellChecker.end() throws IllegalArgumentException
         SearchRequestBuilder searchBuilder = createSuggesterSearch("text.ngrams");
 
-        assertResponse(searchBuilder, response -> {
-            assertThat(response.status(), equalTo(RestStatus.OK));
-            assertThat(response.getFailedShards(), greaterThan(0));
-            assertThat(response.getShardFailures().length, greaterThan(0));
-            for (ShardSearchFailure shardFailure : response.getShardFailures()) {
-                assertTrue(shardFailure.getCause() instanceof IllegalArgumentException);
-                assertEquals("At least one unigram is required but all tokens were ngrams", shardFailure.getCause().getMessage());
-            }
-        });
+        try {
+            assertResponse(searchBuilder, response -> {
+                // We didn't fail all shards - we get a response with failed shards
+                assertThat(response.status(), equalTo(RestStatus.OK));
+                assertThat(response.getFailedShards(), greaterThan(0));
+                assertThat(response.getShardFailures().length, greaterThan(0));
+                checkShardFailures(response.getShardFailures());
+            });
+        } catch (SearchPhaseExecutionException e) {
+            // If all shards fail, we get a SearchPhaseExecutionException
+            checkShardFailures(e.shardFailures());
+        }
+    }
+
+    private static void checkShardFailures(ShardSearchFailure[] shardFailures) {
+        for (ShardSearchFailure shardFailure : shardFailures) {
+            assertTrue(shardFailure.getCause() instanceof IllegalArgumentException);
+            assertEquals("At least one unigram is required but all tokens were ngrams", shardFailure.getCause().getMessage());
+        }
     }
 
     private static SearchRequestBuilder createSuggesterSearch(String fieldName) {
@@ -104,7 +115,7 @@ private void createIndexAndDocs(boolean outputUnigrams) throws IOException {
         assertAcked(
             prepareCreate("test").setSettings(
                 Settings.builder()
-                    .put(SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 5))
+                    .put(SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 10))
                     .put("index.analysis.analyzer.ngram_only.tokenizer", "standard")
                     .putList("index.analysis.analyzer.ngram_only.filter", "my_shingle", "lowercase")
                     .put("index.analysis.filter.my_shingle.type", "shingle")

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java

@@ -364,6 +364,7 @@ public void analyzedPlan(
         QueryBuilder requestFilter,
         ActionListener<LogicalPlan> logicalPlanListener
     ) {
+        assert ThreadPool.assertCurrentThreadPool(ThreadPool.Names.SEARCH);
         if (parsed.analyzed()) {
             logicalPlanListener.onResponse(parsed);
             return;
@@ -440,6 +441,11 @@ private void preAnalyzeLookupIndex(
         String localPattern = lookupIndexPattern.indexPattern();
         assert RemoteClusterAware.isRemoteIndexName(localPattern) == false
             : "Lookup index name should not include remote, but got: " + localPattern;
+        assert ThreadPool.assertCurrentThreadPool(
+            ThreadPool.Names.SEARCH,
+            ThreadPool.Names.SEARCH_COORDINATION,
+            ThreadPool.Names.SYSTEM_READ
+        );
         Set<String> fieldNames = result.wildcardJoinIndices().contains(localPattern) ? IndexResolver.ALL_FIELDS : result.fieldNames;
 
         String patternWithRemotes;
@@ -625,6 +631,11 @@ private void preAnalyzeMainIndices(
         QueryBuilder requestFilter,
         ActionListener<PreAnalysisResult> listener
     ) {
+        assert ThreadPool.assertCurrentThreadPool(
+            ThreadPool.Names.SEARCH,
+            ThreadPool.Names.SEARCH_COORDINATION,
+            ThreadPool.Names.SYSTEM_READ
+        );
         // TODO we plan to support joins in the future when possible, but for now we'll just fail early if we see one
         List<IndexPattern> indices = preAnalysis.indices;
         if (indices.size() > 1) {

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java

@@ -60,7 +60,7 @@ public abstract class StandardVersusLogsIndexModeChallengeRestIT extends Abstrac
     protected final DataGenerationHelper dataGenerationHelper;
 
     public StandardVersusLogsIndexModeChallengeRestIT() {
-        this(new DataGenerationHelper());
+        this(new DataGenerationHelper(builder -> builder.withMaxFieldCountPerLevel(30)));
     }
 
     protected StandardVersusLogsIndexModeChallengeRestIT(DataGenerationHelper dataGenerationHelper) {