Browse Source

Fix SearchShards to be project aware (MP-1822)

This fixes 1 remaining place in `TransportSearchShardsAction` that
relied on the default project.

This change allows a lot of ES|QL tests to pass
Tim Vernum 10 months ago
parent
commit
3f07b1b07a

+ 1 - 1
server/src/main/java/org/elasticsearch/action/search/TransportSearchShardsAction.java

@@ -117,7 +117,7 @@ public class TransportSearchShardsAction extends HandledTransportAction<SearchSh
         final ProjectState project = projectResolver.getProjectState(clusterService.state());
         final ResolvedIndices resolvedIndices = ResolvedIndices.resolveWithIndicesRequest(
             searchShardsRequest,
-            project.cluster(),
+            project.metadata(),
             indexNameExpressionResolver,
             remoteClusterService,
             timeProvider.absoluteStartMillis()

+ 0 - 21
x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle

@@ -40,35 +40,14 @@ tasks.named("yamlRestTest").configure {
     '^enrich/30_tsdb_index/*',
     '^enrich/40_synthetic_source/*',
     '^enrich/50_data_stream/*',
-    '^esql/100_bug_fix/*',
-    '^esql/10_basic/*',
-    '^esql/20_aggs/*',
-    '^esql/25_aggs_on_null/*',
-    '^esql/26_aggs_bucket/*',
-    '^esql/30_types/*',
     '^esql/40_tsdb/*',
-    '^esql/40_unsupported_types/*',
     '^esql/45_non_tsdb_counter/*',
-    '^esql/50_index_patterns/*',
     '^esql/60_enrich/*',
     '^esql/60_usage/*',
     '^esql/61_enrich_ip/*',
     '^esql/62_extra_enrich/*',
     '^esql/63_enrich_int_range/*',
     '^esql/64_enrich_int_match/*',
-    '^esql/70_locale/*',
-    '^esql/80_text/*',
-    '^esql/81_text_exact_subfields/*',
-    '^esql/90_non_indexed/*',
-    '^esql/110_all_null/*',
-    '^esql/120_profile/*',
-    '^esql/130_spatial/*',
-    '^esql/140_metadata/*',
-    '^esql/150_lookup/*',
-    '^esql/160_union_types/*',
-    '^esql/161_union_types_subfields/*',
-    '^esql/170_no_replicas/*',
-    '^esql/180_match_operator/*',
     '^health/10_usage/*',
     '^ilm/10_basic/Test Undeletable Policy In Use',
     '^ilm/20_move_to_step/*',