diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java index 2b6bcf931641b..57bc18ee7d62b 100644 --- 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 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 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 index f221cf15d0ccc..14678d65d32f1 100644 --- 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 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 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 index ea9c518af8c6b..186be954b958a 100644 --- 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 li protected abstract Response shardOperation(Request request, ShardId shardId) throws IOException; protected void asyncShardOperation(Request request, ShardId shardId, ActionListener 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 getResponseReader(); @@ -300,7 +300,7 @@ public String concreteIndex() { } } - protected Executor getExecutor(Request request, ShardId shardId) { + protected Executor getExecutor(ShardId shardId) { return executor; } }