Skip to content

Commit 8deb2fa

Browse files
committed
resolving project id less
1 parent 04dfd46 commit 8deb2fa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ protected void masterOperation(
8282
ClusterState state,
8383
ActionListener<UpdateDataStreamMappingsAction.Response> listener
8484
) throws Exception {
85+
ProjectId projectId = projectResolver.getProjectId();
8586
List<String> dataStreamNames = indexNameExpressionResolver.dataStreamNames(
86-
projectResolver.getProjectMetadata(state),
87+
state.metadata().getProject(projectId),
8788
IndicesOptions.DEFAULT,
8889
request.indices()
8990
);
@@ -99,6 +100,7 @@ protected void masterOperation(
99100
countDownListener.onResponse(null);
100101
for (String dataStreamName : dataStreamNames) {
101102
updateSingleDataStream(
103+
projectId,
102104
dataStreamName,
103105
request.getMappings(),
104106
request.masterNodeTimeout(),
@@ -124,6 +126,7 @@ protected void masterOperation(
124126
}
125127

126128
private void updateSingleDataStream(
129+
ProjectId projectId,
127130
String dataStreamName,
128131
CompressedXContent mappingsOverrides,
129132
TimeValue masterNodeTimeout,
@@ -144,7 +147,6 @@ private void updateSingleDataStream(
144147
);
145148
return;
146149
}
147-
ProjectId projectId = projectResolver.getProjectId();
148150
metadataDataStreamsService.updateMappings(
149151
projectId,
150152
masterNodeTimeout,

0 commit comments

Comments
 (0)