Skip to content

Fixing multiproject handling in TransportUpdateDataStreamMappingsAction #130247

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 4 commits into from
Jun 27, 2025
Merged

Fixing multiproject handling in TransportUpdateDataStreamMappingsAction #130247

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20153c6
Fixing multiproject handling in TransportUpdateDataStreamMappingsAction
masseyke Jun 27, 2025
dbfae66
code review feedback
masseyke Jun 27, 2025
04dfd46
Merge branch 'main' into minor-multiproject-fix
masseyke Jun 27, 2025
8deb2fa
resolving project id less
masseyke Jun 27, 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
12 changes: 7 additions & 5 deletions ...in/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetadataDataStreamsService;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -81,8 +82,9 @@ protected void masterOperation(
ClusterState state,
ActionListener<UpdateDataStreamMappingsAction.Response> listener
) throws Exception {
ProjectId projectId = projectResolver.getProjectId();
List<String> dataStreamNames = indexNameExpressionResolver.dataStreamNames(
state.projectState(projectResolver.getProjectId()).metadata(),
state.metadata().getProject(projectId),
IndicesOptions.DEFAULT,
request.indices()
);
Expand All @@ -98,6 +100,7 @@ protected void masterOperation(
countDownListener.onResponse(null);
for (String dataStreamName : dataStreamNames) {
updateSingleDataStream(
projectId,
dataStreamName,
request.getMappings(),
request.masterNodeTimeout(),
Expand All @@ -123,6 +126,7 @@ protected void masterOperation(
}

private void updateSingleDataStream(
ProjectId projectId,
String dataStreamName,
CompressedXContent mappingsOverrides,
TimeValue masterNodeTimeout,
Expand All @@ -144,7 +148,7 @@ private void updateSingleDataStream(
return;
}
metadataDataStreamsService.updateMappings(
projectResolver.getProjectId(),
projectId,
masterNodeTimeout,
ackTimeout,
dataStreamName,
Expand All @@ -159,9 +163,7 @@ private void updateSingleDataStream(
true,
null,
mappingsOverrides,
dataStream.getEffectiveMappings(
clusterService.state().projectState(projectResolver.getProjectId()).metadata()
)
dataStream.getEffectiveMappings(clusterService.state().metadata().getProject(projectId))
)
);
} catch (IOException e) {
Expand Down