Skip to content

[Failure Store] Fix resolved alias retrieval for failure indices #127458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 29, 2025
Merged

[Failure Store] Fix resolved alias retrieval for failure indices #127458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7922694
Add test that captures the different behaviour between `::data` and `…
gmarouli Apr 28, 2025
7c01622
Retrieve the already resolved alias also for failure indices
gmarouli Apr 28, 2025
76aa1d5
Use new method in other test cases
gmarouli Apr 28, 2025
8c45441
Commit the rest of the test code
gmarouli Apr 28, 2025
28c5173
Fix test
gmarouli Apr 29, 2025
2d53920
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 29, 2025
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
10 changes: 1 addition & 9 deletions ...ava/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.elasticsearch.cluster.routing.ShardIterator;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.core.Predicates;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.injection.guice.Inject;
Expand Down Expand Up @@ -105,14 +104,7 @@ protected void masterOperation(
Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(project.metadata(), request.indices());
for (String index : concreteIndices) {
final AliasFilter aliasFilter = indicesService.buildAliasFilter(project, index, indicesAndAliases);
final String[] aliases = indexNameExpressionResolver.indexAliases(
project.metadata(),
index,
Predicates.always(),
Predicates.always(),
true,
indicesAndAliases
);
final String[] aliases = indexNameExpressionResolver.allIndexAliases(project.metadata(), index, indicesAndAliases);
indicesAndFilters.put(index, AliasFilter.of(aliasFilter.getQueryBuilder(), aliases));
}

Expand Down
10 changes: 1 addition & 9 deletions server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import org.elasticsearch.common.util.Maps;
import org.elasticsearch.common.util.concurrent.CountDown;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.Predicates;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNotFoundException;
Expand Down Expand Up @@ -232,14 +231,7 @@ private Map<String, OriginalIndices> buildPerIndexOriginalIndices(
blocks.indexBlockedRaiseException(projectState.projectId(), ClusterBlockLevel.READ, index);
}

String[] aliases = indexNameExpressionResolver.indexAliases(
projectState.metadata(),
index,
Predicates.always(),
Predicates.always(),
true,
indicesAndAliases
);
String[] aliases = indexNameExpressionResolver.allIndexAliases(projectState.metadata(), index, indicesAndAliases);
String[] finalIndices = Strings.EMPTY_ARRAY;
if (aliases == null
|| aliases.length == 0
Expand Down
56 changes: 39 additions & 17 deletions server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.function.BiFunction;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.function.LongSupplier;
import java.util.function.Predicate;
Expand All @@ -80,6 +81,13 @@ public class IndexNameExpressionResolver {
public static final String EXCLUDED_DATA_STREAMS_KEY = "es.excluded_ds";
public static final IndexVersion SYSTEM_INDEX_ENFORCEMENT_INDEX_VERSION = IndexVersions.V_8_0_0;

private static final BiPredicate<DataStreamAlias, Boolean> ALL_DATA_STREAM_ALIASES = (ignoredAlias, ignoredIsData) -> true;
// Alias filters are not applied against indices in an abstraction's failure component.
// They do not match the mapping of the data stream nor are the documents mapped for searching.
private static final BiPredicate<DataStreamAlias, Boolean> ONLY_FILTERING_DATA_STREAM_ALIASES = (
dataStreamAlias,
isData) -> dataStreamAlias.filteringRequired() && isData;

private final ThreadContext threadContext;
private final SystemIndices systemIndices;
private final ProjectResolver projectResolver;
Expand Down Expand Up @@ -1054,12 +1062,21 @@ public String[] filteringAliases(ProjectMetadata project, String index, Set<Reso
project,
index,
AliasMetadata::filteringRequired,
DataStreamAlias::filteringRequired,
ONLY_FILTERING_DATA_STREAM_ALIASES,
false,
resolvedExpressions
);
}

/**
* Iterates through the list of indices and selects the effective list of all aliases for the
* given index. Aliases are returned even if the index is included in the resolved expressions.
* <b>NOTE</b>: The provided expressions must have been resolved already via {@link #resolveExpressions}.
*/
public String[] allIndexAliases(ProjectMetadata project, String index, Set<ResolvedExpression> resolvedExpressions) {
return indexAliases(project, index, Predicates.always(), ALL_DATA_STREAM_ALIASES, true, resolvedExpressions);
}

/**
* Whether to generate the candidate set from index aliases, or from the set of resolved expressions.
* @param indexAliasesSize the number of aliases of the index
Expand All @@ -1080,7 +1097,7 @@ public String[] indexAliases(
ProjectMetadata project,
String index,
Predicate<AliasMetadata> requiredAlias,
Predicate<DataStreamAlias> requiredDataStreamAlias,
BiPredicate<DataStreamAlias, Boolean> requiredDataStreamAlias,
boolean skipIdentity,
Set<ResolvedExpression> resolvedExpressions
) {
Expand All @@ -1107,13 +1124,8 @@ public String[] indexAliases(
IndexAbstraction ia = project.getIndicesLookup().get(index);
DataStream dataStream = ia.getParentDataStream();
if (dataStream != null) {
if (dataStream.getFailureComponent().containsIndex(index)) {
// Alias filters are not applied against indices in an abstraction's failure component.
// They do not match the mapping of the data stream nor are the documents mapped for searching.
return null;
}

if (skipIdentity == false && resolvedExpressionsContainsAbstraction(resolvedExpressions, dataStream.getName())) {
boolean isData = dataStream.isFailureStoreIndex(index) == false;
if (skipIdentity == false && resolvedExpressionsContainsAbstraction(resolvedExpressions, dataStream.getName(), isData)) {
// skip the filters when the request targets the data stream name + selector directly
return null;
}
Expand All @@ -1122,12 +1134,14 @@ public String[] indexAliases(
if (iterateIndexAliases(dataStreamAliases.size(), resolvedExpressions.size())) {
aliasesForDataStream = dataStreamAliases.values()
.stream()
.filter(dataStreamAlias -> resolvedExpressionsContainsAbstraction(resolvedExpressions, dataStreamAlias.getName()))
.filter(
dataStreamAlias -> resolvedExpressionsContainsAbstraction(resolvedExpressions, dataStreamAlias.getName(), isData)
)
.filter(dataStreamAlias -> dataStreamAlias.getDataStreams().contains(dataStream.getName()))
.toList();
} else {
aliasesForDataStream = resolvedExpressions.stream()
.filter(expression -> expression.selector() == null || expression.selector().shouldIncludeData())
.filter(expression -> (expression.selector() == null || expression.selector().shouldIncludeData()) == isData)
.map(ResolvedExpression::resource)
.map(dataStreamAliases::get)
.filter(dataStreamAlias -> dataStreamAlias != null && dataStreamAlias.getDataStreams().contains(dataStream.getName()))
Expand All @@ -1136,11 +1150,12 @@ public String[] indexAliases(

List<String> requiredAliases = null;
for (DataStreamAlias dataStreamAlias : aliasesForDataStream) {
if (requiredDataStreamAlias.test(dataStreamAlias)) {
if (requiredDataStreamAlias.test(dataStreamAlias, isData)) {
if (requiredAliases == null) {
requiredAliases = new ArrayList<>(aliasesForDataStream.size());
}
requiredAliases.add(dataStreamAlias.getName());
String alias = isData ? dataStreamAlias.getName() : dataStreamAlias.getName() + "::failures";
requiredAliases.add(alias);
} else {
// we have a non-required alias for this data stream so no need to check further
return null;
Expand All @@ -1162,7 +1177,7 @@ public String[] indexAliases(
// Indices can only be referenced with a data selector, or a null selector if selectors are disabled
for (AliasMetadata aliasMetadata : indexAliases.values()) {
var alias = aliasMetadata.alias();
if (resolvedExpressionsContainsAbstraction(resolvedExpressions, alias)) {
if (resolvedExpressionsContainsAbstraction(resolvedExpressions, alias, true)) {
if (requiredAlias.test(aliasMetadata) == false) {
return null;
}
Expand All @@ -1185,9 +1200,16 @@ public String[] indexAliases(
}
}

private static boolean resolvedExpressionsContainsAbstraction(Set<ResolvedExpression> resolvedExpressions, String abstractionName) {
return resolvedExpressions.contains(new ResolvedExpression(abstractionName))
|| resolvedExpressions.contains(new ResolvedExpression(abstractionName, IndexComponentSelector.DATA));
private static boolean resolvedExpressionsContainsAbstraction(
Set<ResolvedExpression> resolvedExpressions,
String abstractionName,
boolean isData
) {
if (isData) {
return resolvedExpressions.contains(new ResolvedExpression(abstractionName))
|| resolvedExpressions.contains(new ResolvedExpression(abstractionName, IndexComponentSelector.DATA));
}
return resolvedExpressions.contains(new ResolvedExpression(abstractionName, IndexComponentSelector.FAILURES));
}

/**
Expand Down
Loading