From 20153c69246cc3b6118a56c6528407f7adaa4a0b Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Fri, 27 Jun 2025 13:01:44 -0500 Subject: [PATCH 1/3] Fixing multiproject handling in TransportUpdateDataStreamMappingsAction --- .../TransportUpdateDataStreamMappingsAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java index 0fc176201ff27..bdf14aef998de 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java @@ -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; @@ -82,7 +83,7 @@ protected void masterOperation( ActionListener listener ) throws Exception { List dataStreamNames = indexNameExpressionResolver.dataStreamNames( - state.projectState(projectResolver.getProjectId()).metadata(), + projectResolver.getProjectMetadata(state), IndicesOptions.DEFAULT, request.indices() ); @@ -143,8 +144,9 @@ private void updateSingleDataStream( ); return; } + ProjectId projectId = projectResolver.getProjectId(); metadataDataStreamsService.updateMappings( - projectResolver.getProjectId(), + projectId, masterNodeTimeout, ackTimeout, dataStreamName, @@ -159,9 +161,7 @@ private void updateSingleDataStream( true, null, mappingsOverrides, - dataStream.getEffectiveMappings( - clusterService.state().projectState(projectResolver.getProjectId()).metadata() - ) + dataStream.getEffectiveMappings(clusterService.state().projectState(projectId).metadata()) ) ); } catch (IOException e) { From dbfae6660f09d430012e3cc5abe7c0963e939ca0 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Fri, 27 Jun 2025 13:26:58 -0500 Subject: [PATCH 2/3] code review feedback --- .../action/TransportUpdateDataStreamMappingsAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java index bdf14aef998de..c064e83419830 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java @@ -161,7 +161,7 @@ private void updateSingleDataStream( true, null, mappingsOverrides, - dataStream.getEffectiveMappings(clusterService.state().projectState(projectId).metadata()) + dataStream.getEffectiveMappings(clusterService.state().metadata().getProject(projectId)) ) ); } catch (IOException e) { From 8deb2fa7a7be43611941cbbcb7bfb9cc9f973e52 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Fri, 27 Jun 2025 14:11:42 -0500 Subject: [PATCH 3/3] resolving project id less --- .../action/TransportUpdateDataStreamMappingsAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java index c064e83419830..beccd0c190542 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java @@ -82,8 +82,9 @@ protected void masterOperation( ClusterState state, ActionListener listener ) throws Exception { + ProjectId projectId = projectResolver.getProjectId(); List dataStreamNames = indexNameExpressionResolver.dataStreamNames( - projectResolver.getProjectMetadata(state), + state.metadata().getProject(projectId), IndicesOptions.DEFAULT, request.indices() ); @@ -99,6 +100,7 @@ protected void masterOperation( countDownListener.onResponse(null); for (String dataStreamName : dataStreamNames) { updateSingleDataStream( + projectId, dataStreamName, request.getMappings(), request.masterNodeTimeout(), @@ -124,6 +126,7 @@ protected void masterOperation( } private void updateSingleDataStream( + ProjectId projectId, String dataStreamName, CompressedXContent mappingsOverrides, TimeValue masterNodeTimeout, @@ -144,7 +147,6 @@ private void updateSingleDataStream( ); return; } - ProjectId projectId = projectResolver.getProjectId(); metadataDataStreamsService.updateMappings( projectId, masterNodeTimeout,