Merge branch 'main' into caller-class

prdoyle · web-flow · commit 83bbefd03593 · 2025-03-19T16:51:40.000-04:00
diff --git a/build-conventions/settings.gradle b/build-conventions/settings.gradle
@@ -8,7 +8,7 @@
  */
 
 plugins {
-  id "com.gradle.develocity" version "3.18.1"
+  id "com.gradle.develocity" version "3.19.2"
 }
 
 rootProject.name = 'build-conventions'
diff --git a/build-tools-internal/settings.gradle b/build-tools-internal/settings.gradle
@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-  id "com.gradle.develocity" version "3.18.1"
+  id "com.gradle.develocity" version "3.19.2"
 }
 
 dependencyResolutionManagement {
diff --git a/build-tools/settings.gradle b/build-tools/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
     includeBuild "../build-conventions"
 }
 plugins {
-  id "com.gradle.develocity" version "3.18.1"
+  id "com.gradle.develocity" version "3.19.2"
 }
 include 'reaper'
 
diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml
@@ -16,7 +16,7 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.3"
 commmons-io = "commons-io:commons-io:2.2"
 docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
 forbiddenApis = "de.thetaphi:forbiddenapis:3.8"
-gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.18.1"
+gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.19.2"
 hamcrest = "org.hamcrest:hamcrest:2.1"
 httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3"
 httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -814,14 +814,9 @@
             <sha256 value="48234cd74e35d91a31a683820a35b5b6d11b55527f32a5b162c6757408b95d7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.gradle" name="develocity-gradle-plugin" version="3.17.4">
-         <artifact name="develocity-gradle-plugin-3.17.4.jar">
-            <sha256 value="e2b3f8a191b0b401b75c2c4542d3d1719814a4212e6920fae4f2f940678bfd99" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradle" name="develocity-gradle-plugin" version="3.18.1">
-         <artifact name="develocity-gradle-plugin-3.18.1.jar">
-            <sha256 value="0adf32afef4ae46a131367e393d18a5d9529750dfd1432287797a64b2c36c7ef" origin="Generated by Gradle"/>
+      <component group="com.gradle" name="develocity-gradle-plugin" version="3.19.2">
+         <artifact name="develocity-gradle-plugin-3.19.2.jar">
+            <sha256 value="fc611e8858a901619831ea1d9efd289db7fea28a0ca3d091abdd363365d9512b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="8.3.5">
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -285,9 +285,6 @@ tests:
 - class: org.elasticsearch.smoketest.MlWithSecurityIT
   method: test {yaml=ml/start_data_frame_analytics/Test start classification analysis when the dependent variable is missing}
   issue: https://github.com/elastic/elasticsearch/issues/124168
-- class: org.elasticsearch.search.fieldcaps.FieldCapabilitiesIT
-  method: testRelocation
-  issue: https://github.com/elastic/elasticsearch/issues/124227
 - class: org.elasticsearch.smoketest.MlWithSecurityIT
   method: test {yaml=ml/3rd_party_deployment/Test start and stop multiple deployments}
   issue: https://github.com/elastic/elasticsearch/issues/124315
diff --git a/plugins/examples/settings.gradle b/plugins/examples/settings.gradle
@@ -8,7 +8,7 @@
  */
 
 plugins {
-  id "com.gradle.develocity" version "3.18.1"
+  id "com.gradle.develocity" version "3.19.2"
 }
 
 // Include all subdirectories as example projects
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java
@@ -84,6 +84,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.IntStream;
 
 import static java.util.Collections.singletonList;
@@ -557,11 +558,14 @@ public void testNoActiveCopy() throws Exception {
         }
     }
 
-    private void moveOrCloseShardsOnNodes(String nodeName) throws Exception {
+    private void moveOrCloseShardsOnNodes(String nodeName, Predicate<String> indexName) throws Exception {
         final IndicesService indicesService = internalCluster().getInstance(IndicesService.class, nodeName);
         final ClusterState clusterState = clusterService().state();
         for (IndexService indexService : indicesService) {
             for (IndexShard indexShard : indexService) {
+                if (indexName.test(indexShard.shardId().getIndexName()) == false) {
+                    continue;
+                }
                 if (randomBoolean()) {
                     closeShardNoCheck(indexShard, randomBoolean());
                 } else if (randomBoolean()) {
@@ -603,13 +607,21 @@ private void moveOrCloseShardsOnNodes(String nodeName) throws Exception {
 
     public void testRelocation() throws Exception {
         populateTimeRangeIndices();
+        assertAcked(
+            client().admin()
+                .indices()
+                .prepareUpdateSettings("log-index-*")
+                .setSettings(Settings.builder().put("index.routing.rebalance.enable", "none").build())
+                .get()
+        );
+        ensureGreen("log-index-*");
         try {
             final AtomicBoolean relocated = new AtomicBoolean();
             for (String node : internalCluster().getNodeNames()) {
                 MockTransportService.getInstance(node)
                     .addRequestHandlingBehavior(TransportFieldCapabilitiesAction.ACTION_NODE_NAME, (handler, request, channel, task) -> {
                         if (relocated.compareAndSet(false, true)) {
-                            moveOrCloseShardsOnNodes(node);
+                            moveOrCloseShardsOnNodes(node, indexName -> indexName.startsWith("log-index-"));
                         }
                         handler.messageReceived(request, channel, task);
                     });
diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
@@ -167,18 +167,18 @@ protected Writeable.Reader<GetResponse> getResponseReader() {
     }
 
     @Override
-    protected Executor getExecutor(GetRequest request, ShardId shardId) {
+    protected Executor getExecutor(ShardId shardId) {
         final ClusterState clusterState = clusterService.state();
         if (projectResolver.getProjectMetadata(clusterState).getIndexSafe(shardId.getIndex()).isSystem()) {
             return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
         } else {
-            return super.getExecutor(request, shardId);
+            return super.getExecutor(shardId);
         }
     }
 
     private void asyncGet(GetRequest request, ShardId shardId, ActionListener<GetResponse> listener) throws IOException {
         if (request.refresh() && request.realtime() == false) {
-            getExecutor(request, shardId).execute(ActionRunnable.wrap(listener, l -> {
+            getExecutor(shardId).execute(ActionRunnable.wrap(listener, l -> {
                 var indexShard = getIndexShard(shardId);
                 indexShard.externalRefresh("refresh_flag_get", l.map(r -> shardOperation(request, shardId)));
             }));
@@ -300,7 +300,7 @@ private void tryGetFromTranslog(GetRequest request, IndexShard indexShard, Disco
                         indexShard.waitForPrimaryTermAndGeneration(r.primaryTerm(), r.segmentGeneration(), termAndGenerationListener);
                     }
                 }
-            }), TransportGetFromTranslogAction.Response::new, getExecutor(request, shardId))
+            }), TransportGetFromTranslogAction.Response::new, getExecutor(shardId))
         );
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
@@ -156,12 +156,12 @@ protected MultiGetShardResponse shardOperation(MultiGetShardRequest request, Sha
     }
 
     @Override
-    protected Executor getExecutor(MultiGetShardRequest request, ShardId shardId) {
+    protected Executor getExecutor(ShardId shardId) {
         final ClusterState clusterState = clusterService.state();
         if (projectResolver.getProjectMetadata(clusterState).index(shardId.getIndex()).isSystem()) {
             return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
         } else {
-            return super.getExecutor(request, shardId);
+            return super.getExecutor(shardId);
         }
     }
 
@@ -290,7 +290,7 @@ private void tryShardMultiGetFromTranslog(
                         assert r.primaryTerm() > Engine.UNKNOWN_PRIMARY_TERM;
                         final ActionListener<Long> termAndGenerationListener = ContextPreservingActionListener.wrapPreservingContext(
                             listener.delegateFailureAndWrap(
-                                (ll, aLong) -> getExecutor(request, shardId).execute(
+                                (ll, aLong) -> getExecutor(shardId).execute(
                                     ActionRunnable.supply(ll, () -> handleLocalGets(request, r.multiGetShardResponse(), shardId))
                                 )
                             ),
@@ -299,7 +299,7 @@ private void tryShardMultiGetFromTranslog(
                         indexShard.waitForPrimaryTermAndGeneration(r.primaryTerm(), r.segmentGeneration(), termAndGenerationListener);
                     }
                 }
-            }), TransportShardMultiGetFomTranslogAction.Response::new, getExecutor(request, shardId))
+            }), TransportShardMultiGetFomTranslogAction.Response::new, getExecutor(shardId))
         );
     }
 
@@ -353,7 +353,7 @@ private void getAndAddToResponse(
     private void asyncShardMultiGet(MultiGetShardRequest request, ShardId shardId, ActionListener<MultiGetShardResponse> listener)
         throws IOException {
         if (request.refresh() && request.realtime() == false) {
-            getExecutor(request, shardId).execute(ActionRunnable.wrap(listener, l -> {
+            getExecutor(shardId).execute(ActionRunnable.wrap(listener, l -> {
                 var indexShard = getIndexShard(shardId);
                 indexShard.externalRefresh("refresh_flag_mget", l.map(r -> shardOperation(request, shardId)));
             }));
diff --git a/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
@@ -114,7 +114,7 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
     protected abstract Response shardOperation(Request request, ShardId shardId) throws IOException;
 
     protected void asyncShardOperation(Request request, ShardId shardId, ActionListener<Response> listener) throws IOException {
-        getExecutor(request, shardId).execute(ActionRunnable.supplyAndDecRef(listener, () -> shardOperation(request, shardId)));
+        getExecutor(shardId).execute(ActionRunnable.supplyAndDecRef(listener, () -> shardOperation(request, shardId)));
     }
 
     protected abstract Writeable.Reader<Response> getResponseReader();
@@ -300,7 +300,7 @@ public String concreteIndex() {
         }
     }
 
-    protected Executor getExecutor(Request request, ShardId shardId) {
+    protected Executor getExecutor(ShardId shardId) {
         return executor;
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-  id "com.gradle.develocity" version "3.18.1"
+  id "com.gradle.develocity" version "3.19.2"
   id 'elasticsearch.java-toolchain'
 }
 
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java
@@ -44,23 +44,15 @@ public static class Request extends AcknowledgedRequest<GetInferenceModelAction.
         // no effect when getting a single model
         private final boolean persistDefaultConfig;
 
-        // For testing only, retrieves the minimal config from the cluster state.
-        private final boolean returnMinimalConfig;
-
         public Request(String inferenceEntityId, TaskType taskType) {
             this(inferenceEntityId, taskType, PERSIST_DEFAULT_CONFIGS);
         }
 
         public Request(String inferenceEntityId, TaskType taskType, boolean persistDefaultConfig) {
-            this(inferenceEntityId, taskType, persistDefaultConfig, false);
-        }
-
-        public Request(String inferenceEntityId, TaskType taskType, boolean persistDefaultConfig, boolean returnMinimalConfig) {
             super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, DEFAULT_ACK_TIMEOUT);
             this.inferenceEntityId = Objects.requireNonNull(inferenceEntityId);
             this.taskType = Objects.requireNonNull(taskType);
             this.persistDefaultConfig = persistDefaultConfig;
-            this.returnMinimalConfig = returnMinimalConfig;
         }
 
         public Request(StreamInput in) throws IOException {
@@ -72,13 +64,6 @@ public Request(StreamInput in) throws IOException {
             } else {
                 this.persistDefaultConfig = PERSIST_DEFAULT_CONFIGS;
             }
-
-            if (in.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_MODEL_REGISTRY_METADATA)) {
-                this.returnMinimalConfig = in.readBoolean();
-            } else {
-                this.returnMinimalConfig = false;
-            }
-
         }
 
         public String getInferenceEntityId() {
@@ -93,10 +78,6 @@ public boolean isPersistDefaultConfig() {
             return persistDefaultConfig;
         }
 
-        public boolean isReturnMinimalConfig() {
-            return returnMinimalConfig;
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
@@ -105,10 +86,6 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
                 out.writeBoolean(this.persistDefaultConfig);
             }
-
-            if (out.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_MODEL_REGISTRY_METADATA)) {
-                out.writeBoolean(returnMinimalConfig);
-            }
         }
 
         @Override
@@ -118,13 +95,12 @@ public boolean equals(Object o) {
             Request request = (Request) o;
             return Objects.equals(inferenceEntityId, request.inferenceEntityId)
                 && taskType == request.taskType
-                && persistDefaultConfig == request.persistDefaultConfig
-                && returnMinimalConfig == request.returnMinimalConfig;
+                && persistDefaultConfig == request.persistDefaultConfig;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(inferenceEntityId, taskType, persistDefaultConfig, returnMinimalConfig);
+            return Objects.hash(inferenceEntityId, taskType, persistDefaultConfig);
         }
     }
 
diff --git a/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/DefaultEndPointsIT.java b/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/DefaultEndPointsIT.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.CountDownLatch;
 
 import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.oneOf;
@@ -62,6 +63,25 @@ public void testGet() throws IOException {
         assertDefaultRerankConfig(rerankModel);
     }
 
+    public void testDefaultModels() throws IOException {
+        var elserModel = getModel(ElasticsearchInternalService.DEFAULT_ELSER_ID);
+        assertDefaultElserConfig(elserModel);
+
+        var e5Model = getModel(ElasticsearchInternalService.DEFAULT_E5_ID);
+        assertDefaultE5Config(e5Model);
+
+        var rerankModel = getModel(ElasticsearchInternalService.DEFAULT_RERANK_ID);
+        assertDefaultRerankConfig(rerankModel);
+
+        putModel("my-model", mockCompletionServiceModelConfig(TaskType.SPARSE_EMBEDDING));
+        var registeredModels = getMinimalConfigs();
+        assertThat(registeredModels.size(), equalTo(1));
+        assertTrue(registeredModels.containsKey("my-model"));
+        assertFalse(registeredModels.containsKey(ElasticsearchInternalService.DEFAULT_E5_ID));
+        assertFalse(registeredModels.containsKey(ElasticsearchInternalService.DEFAULT_ELSER_ID));
+        assertFalse(registeredModels.containsKey(ElasticsearchInternalService.DEFAULT_RERANK_ID));
+    }
+
     @SuppressWarnings("unchecked")
     public void testInferDeploysDefaultElser() throws IOException {
         var model = getModel(ElasticsearchInternalService.DEFAULT_ELSER_ID);
diff --git a/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceBaseRestTest.java b/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceBaseRestTest.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
+import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
@@ -514,4 +515,13 @@ protected Map<String, Object> getTrainedModel(String inferenceEntityId) throws I
         assertStatusOkOrCreated(response);
         return entityAsMap(response);
     }
+
+    @SuppressWarnings("unchecked")
+    protected Map<String, Map<String, Object>> getMinimalConfigs() throws IOException {
+        var endpoint = "_cluster/state?filter_path=metadata.model_registry";
+        var request = new Request("GET", endpoint);
+        var response = client().performRequest(request);
+        assertOK(response);
+        return (Map<String, Map<String, Object>>) XContentMapValues.extractValue("metadata.model_registry.models", entityAsMap(response));
+    }
 }
diff --git a/x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/InferenceUpgradeTestCase.java b/x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/InferenceUpgradeTestCase.java
@@ -89,7 +89,7 @@ protected Map<String, Object> get(TaskType taskType, String inferenceId) throws
     }
 
     @SuppressWarnings("unchecked")
-    protected Map<String, Map<String, Object>> getMinimalConfig() throws IOException {
+    protected Map<String, Map<String, Object>> getMinimalConfigs() throws IOException {
         var endpoint = "_cluster/state?filter_path=metadata.model_registry";
         var request = new Request("GET", endpoint);
         var response = client().performRequest(request);
diff --git a/x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/ModelRegistryUpgradeIT.java b/x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/ModelRegistryUpgradeIT.java
@@ -83,7 +83,7 @@ public void testUpgradeModels() throws Exception {
     @SuppressWarnings("unchecked")
     private void assertMinimalModelsAreUpgraded() throws IOException {
         var fullModels = (List<Map<String, Object>>) get(TaskType.ANY, "*").get("endpoints");
-        var minimalModels = getMinimalConfig();
+        var minimalModels = getMinimalConfigs();
         assertMinimalModelsAreUpgraded(
             fullModels.stream().collect(Collectors.toMap(a -> (String) a.get("inference_id"), a -> a)),
             minimalModels
@@ -92,9 +92,14 @@ private void assertMinimalModelsAreUpgraded() throws IOException {
 
     @SuppressWarnings("unchecked")
     private void assertMinimalModelsAreUpgraded(
-        Map<String, Map<String, Object>> fullModels,
+        Map<String, Map<String, Object>> fullModelsWithDefaults,
         Map<String, Map<String, Object>> minimalModels
     ) {
+        // remove the default models as they are not stored in cluster state.
+        var fullModels = fullModelsWithDefaults.entrySet()
+            .stream()
+            .filter(e -> e.getKey().startsWith(".") == false)
+            .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
         assertThat(fullModels.size(), greaterThan(0));
         assertThat(fullModels.size(), equalTo(minimalModels.size()));
         for (var entry : fullModels.entrySet()) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`plugins {`
`11`		`- id "com.gradle.develocity" version "3.18.1"`
	`11`	`+ id "com.gradle.develocity" version "3.19.2"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`rootProject.name = 'build-conventions'`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ pluginManagement {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`plugins {`
`12`		`- id "com.gradle.develocity" version "3.18.1"`
	`12`	`+ id "com.gradle.develocity" version "3.19.2"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencyResolutionManagement {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ pluginManagement {`
`10`	`10`	`includeBuild "../build-conventions"`
`11`	`11`	`}`
`12`	`12`	`plugins {`
`13`		`- id "com.gradle.develocity" version "3.18.1"`
	`13`	`+ id "com.gradle.develocity" version "3.19.2"`
`14`	`14`	`}`
`15`	`15`	`include 'reaper'`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -167,18 +167,18 @@ protected Writeable.Reader<GetResponse> getResponseReader() {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`@Override`
`170`		`- protected Executor getExecutor(GetRequest request, ShardId shardId) {`
	`170`	`+ protected Executor getExecutor(ShardId shardId) {`
`171`	`171`	`final ClusterState clusterState = clusterService.state();`
`172`	`172`	`if (projectResolver.getProjectMetadata(clusterState).getIndexSafe(shardId.getIndex()).isSystem()) {`
`173`	`173`	`return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));`
`174`	`174`	`} else {`
`175`		`- return super.getExecutor(request, shardId);`
	`175`	`+ return super.getExecutor(shardId);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`private void asyncGet(GetRequest request, ShardId shardId, ActionListener<GetResponse> listener) throws IOException {`
`180`	`180`	`if (request.refresh() && request.realtime() == false) {`
`181`		`- getExecutor(request, shardId).execute(ActionRunnable.wrap(listener, l -> {`
	`181`	`+ getExecutor(shardId).execute(ActionRunnable.wrap(listener, l -> {`
`182`	`182`	`var indexShard = getIndexShard(shardId);`
`183`	`183`	`indexShard.externalRefresh("refresh_flag_get", l.map(r -> shardOperation(request, shardId)));`
`184`	`184`	`}));`
`@@ -300,7 +300,7 @@ private void tryGetFromTranslog(GetRequest request, IndexShard indexShard, Disco`
`300`	`300`	`indexShard.waitForPrimaryTermAndGeneration(r.primaryTerm(), r.segmentGeneration(), termAndGenerationListener);`
`301`	`301`	`}`
`302`	`302`	`}`
`303`		`- }), TransportGetFromTranslogAction.Response::new, getExecutor(request, shardId))`
	`303`	`+ }), TransportGetFromTranslogAction.Response::new, getExecutor(shardId))`
`304`	`304`	`);`
`305`	`305`	`}`
`306`	`306`
Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,12 @@ protected MultiGetShardResponse shardOperation(MultiGetShardRequest request, Sha`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@Override`
`159`		`- protected Executor getExecutor(MultiGetShardRequest request, ShardId shardId) {`
	`159`	`+ protected Executor getExecutor(ShardId shardId) {`
`160`	`160`	`final ClusterState clusterState = clusterService.state();`
`161`	`161`	`if (projectResolver.getProjectMetadata(clusterState).index(shardId.getIndex()).isSystem()) {`
`162`	`162`	`return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));`
`163`	`163`	`} else {`
`164`		`- return super.getExecutor(request, shardId);`
	`164`	`+ return super.getExecutor(shardId);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`@@ -290,7 +290,7 @@ private void tryShardMultiGetFromTranslog(`
`290`	`290`	`assert r.primaryTerm() > Engine.UNKNOWN_PRIMARY_TERM;`
`291`	`291`	`final ActionListener<Long> termAndGenerationListener = ContextPreservingActionListener.wrapPreservingContext(`
`292`	`292`	`listener.delegateFailureAndWrap(`
`293`		`- (ll, aLong) -> getExecutor(request, shardId).execute(`
	`293`	`+ (ll, aLong) -> getExecutor(shardId).execute(`
`294`	`294`	`ActionRunnable.supply(ll, () -> handleLocalGets(request, r.multiGetShardResponse(), shardId))`
`295`	`295`	`)`
`296`	`296`	`),`
`@@ -299,7 +299,7 @@ private void tryShardMultiGetFromTranslog(`
`299`	`299`	`indexShard.waitForPrimaryTermAndGeneration(r.primaryTerm(), r.segmentGeneration(), termAndGenerationListener);`
`300`	`300`	`}`
`301`	`301`	`}`
`302`		`- }), TransportShardMultiGetFomTranslogAction.Response::new, getExecutor(request, shardId))`
	`302`	`+ }), TransportShardMultiGetFomTranslogAction.Response::new, getExecutor(shardId))`
`303`	`303`	`);`
`304`	`304`	`}`
`305`	`305`
`@@ -353,7 +353,7 @@ private void getAndAddToResponse(`
`353`	`353`	`private void asyncShardMultiGet(MultiGetShardRequest request, ShardId shardId, ActionListener<MultiGetShardResponse> listener)`
`354`	`354`	`throws IOException {`
`355`	`355`	`if (request.refresh() && request.realtime() == false) {`
`356`		`- getExecutor(request, shardId).execute(ActionRunnable.wrap(listener, l -> {`
	`356`	`+ getExecutor(shardId).execute(ActionRunnable.wrap(listener, l -> {`
`357`	`357`	`var indexShard = getIndexShard(shardId);`
`358`	`358`	`indexShard.externalRefresh("refresh_flag_mget", l.map(r -> shardOperation(request, shardId)));`
`359`	`359`	`}));`