Merge branch 'main' into ktlo/esExecutorBug

Author: mosche

docs/changelog/124313.yaml

@@ -0,0 +1,5 @@
+pr: 124313
+summary: Optimize memory usage in `ShardBulkInferenceActionFilter`
+area: Search
+type: enhancement
+issues: []

rest-api-spec/build.gradle

@@ -87,4 +87,5 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
   task.skipTest("indices.create/21_synthetic_source_stored/index param - field ordering", "Synthetic source keep arrays now stores leaf arrays natively")
   task.skipTest("indices.create/21_synthetic_source_stored/field param - keep nested array", "Synthetic source keep arrays now stores leaf arrays natively")
   task.skipTest("indices.create/21_synthetic_source_stored/field param - keep root array", "Synthetic source keep arrays now stores leaf arrays natively")
+  task.skipTest("cluster.info/30_info_thread_pool/Cluster HTTP Info", "The search_throttled thread pool has been removed")
 })

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.info/30_info_thread_pool.yml

@@ -95,13 +95,6 @@
   - gte: { thread_pool.search_coordination.largest: 0 }
   - gte: { thread_pool.search_coordination.completed: 0 }
 
-  - gte: { thread_pool.search_throttled.threads: 0 }
-  - gte: { thread_pool.search_throttled.queue: 0 }
-  - gte: { thread_pool.search_throttled.active: 0 }
-  - gte: { thread_pool.search_throttled.rejected: 0 }
-  - gte: { thread_pool.search_throttled.largest: 0 }
-  - gte: { thread_pool.search_throttled.completed: 0 }
-
   - gte: { thread_pool.snapshot.threads: 0 }
   - gte: { thread_pool.snapshot.queue: 0 }
   - gte: { thread_pool.snapshot.active: 0 }

server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java

@@ -46,7 +46,6 @@
 
 import java.io.IOException;
 import java.util.Set;
-import java.util.concurrent.Executor;
 import java.util.function.LongSupplier;
 
 /**
@@ -184,12 +183,4 @@ protected ShardIterator shards(ProjectState state, InternalRequest request) {
         return clusterService.operationRouting()
             .getShards(state, request.concreteIndex(), request.request().id(), request.request().routing(), request.request().preference());
     }
-
-    @Override
-    protected Executor getExecutor(ExplainRequest request, ShardId shardId) {
-        IndexService indexService = searchService.getIndicesService().indexServiceSafe(shardId.getIndex());
-        return indexService.getIndexSettings().isSearchThrottled()
-            ? threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED)
-            : super.getExecutor(request, shardId);
-    }
 }

server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java

@@ -171,8 +171,6 @@ protected Executor getExecutor(GetRequest request, ShardId shardId) {
         final ClusterState clusterState = clusterService.state();
         if (projectResolver.getProjectMetadata(clusterState).getIndexSafe(shardId.getIndex()).isSystem()) {
             return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
-        } else if (indicesService.indexServiceSafe(shardId.getIndex()).getIndexSettings().isSearchThrottled()) {
-            return threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED);
         } else {
             return super.getExecutor(request, shardId);
         }

server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java

@@ -160,8 +160,6 @@ protected Executor getExecutor(MultiGetShardRequest request, ShardId shardId) {
         final ClusterState clusterState = clusterService.state();
         if (projectResolver.getProjectMetadata(clusterState).index(shardId.getIndex()).isSystem()) {
             return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
-        } else if (indicesService.indexServiceSafe(shardId.getIndex()).getIndexSettings().isSearchThrottled()) {
-            return threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED);
         } else {
             return super.getExecutor(request, shardId);
         }

server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java

@@ -28,8 +28,6 @@
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
-import java.util.concurrent.Executor;
-
 import static org.elasticsearch.core.Strings.format;
 
 public class TransportShardMultiTermsVectorAction extends TransportSingleShardAction<
@@ -112,12 +110,4 @@ protected MultiTermVectorsShardResponse shardOperation(MultiTermVectorsShardRequ
 
         return response;
     }
-
-    @Override
-    protected Executor getExecutor(MultiTermVectorsShardRequest request, ShardId shardId) {
-        IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex());
-        return indexService.getIndexSettings().isSearchThrottled()
-            ? threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED)
-            : super.getExecutor(request, shardId);
-    }
 }

server/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.transport.TransportService;
 
 import java.io.IOException;
-import java.util.concurrent.Executor;
 
 /**
  * Performs the get operation.
@@ -127,12 +126,4 @@ protected TermVectorsResponse shardOperation(TermVectorsRequest request, ShardId
     protected Writeable.Reader<TermVectorsResponse> getResponseReader() {
         return TermVectorsResponse::new;
     }
-
-    @Override
-    protected Executor getExecutor(TermVectorsRequest request, ShardId shardId) {
-        IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex());
-        return indexService.getIndexSettings().isSearchThrottled()
-            ? threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED)
-            : super.getExecutor(request, shardId);
-    }
 }

server/src/main/java/org/elasticsearch/cluster/ClusterModule.java

@@ -107,6 +107,7 @@ public class ClusterModule extends AbstractModule {
 
     public static final String BALANCED_ALLOCATOR = "balanced";
     public static final String DESIRED_BALANCE_ALLOCATOR = "desired_balance"; // default
+    @UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION)
     public static final Setting<String> SHARDS_ALLOCATOR_TYPE_SETTING = Setting.simpleString(
         "cluster.routing.allocation.type",
         DESIRED_BALANCE_ALLOCATOR,

server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

@@ -157,7 +157,6 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
                 IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING,
                 IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING,
                 IndexSettings.INDEX_SEARCH_IDLE_AFTER,
-                IndexSettings.INDEX_SEARCH_THROTTLED,
                 IndexFieldDataService.INDEX_FIELDDATA_CACHE_KEY,
                 IndexSettings.IGNORE_ABOVE_SETTING,
                 FieldMapper.IGNORE_MALFORMED_SETTING,