Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,17 @@ protected void resolveRequest(ClusterState state, InternalRequest request) {

@Override
public ResolvedIndices resolveIndices(Request request) {
return ResolvedIndices.ofNonNull(resolveToConcreteSingleIndex(request, clusterService.state()));
if (resolveIndex(request)) {
// We do not use resolveToConcreteSingleIndex() here because it might throw exceptions for validation errors.
// Instead, we use indexNameExpressionResolver.concreteResolvedIndices(), which allows us to retrieve
// index names without validation errors. This is potentially a super-set of the indices resolved in
// resolveToConcreteSingleIndex(), but this is only a hypothetical state. In practise, we should
// also always get one element here. If for some reason that's not the case, the code will hit the
// validation error when executing the action.
return ResolvedIndices.of(indexNameExpressionResolver.concreteResolvedIndices(clusterService.state(), request));
} else {
return ResolvedIndices.of(request.index());
}
}

private String resolveToConcreteSingleIndex(Request request, ClusterState clusterState) {
Expand Down
Loading