Skip to content

Commit ff0c191

Browse files
committed
Correctly check index service in case index is not a different node
1 parent 40301f2 commit ff0c191

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ protected Executor getExecutor(GetRequest request, ShardId shardId) {
166166
final ClusterState clusterState = clusterService.state();
167167
if (clusterState.metadata().getIndexSafe(shardId.getIndex()).isSystem()) {
168168
return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
169-
} else if (indicesService.indexServiceSafe(shardId.getIndex()).getIndexSettings().isSearchThrottled()) {
169+
}
170+
var indexService = indicesService.indexService(shardId.getIndex());
171+
if (indexService != null && indexService.getIndexSettings().isSearchThrottled()) {
170172
return threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED);
171173
} else {
172174
return super.getExecutor(request, shardId);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ protected Executor getExecutor(MultiGetShardRequest request, ShardId shardId) {
155155
final ClusterState clusterState = clusterService.state();
156156
if (clusterState.metadata().index(shardId.getIndex()).isSystem()) {
157157
return threadPool.executor(executorSelector.executorForGet(shardId.getIndexName()));
158-
} else if (indicesService.indexServiceSafe(shardId.getIndex()).getIndexSettings().isSearchThrottled()) {
158+
}
159+
var indexService = indicesService.indexService(shardId.getIndex());
160+
if (indexService != null && indexService.getIndexSettings().isSearchThrottled()) {
159161
return threadPool.executor(ThreadPool.Names.SEARCH_THROTTLED);
160162
} else {
161163
return super.getExecutor(request, shardId);

0 commit comments

Comments
 (0)