Skip to content

Commit 912de59

Browse files
committed
Project-centric code review feedback
1 parent 5d228a5 commit 912de59

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private void updateSingleDataStream(
193193
return;
194194
}
195195
metadataDataStreamsService.updateSettings(
196-
projectResolver,
196+
projectResolver.getProjectId(),
197197
masterNodeTimeout,
198198
ackTimeout,
199199
dataStreamName,

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataDataStreamsService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.elasticsearch.cluster.ClusterStateUpdateTask;
2222
import org.elasticsearch.cluster.ProjectState;
2323
import org.elasticsearch.cluster.SimpleBatchedAckListenerTaskExecutor;
24-
import org.elasticsearch.cluster.project.ProjectResolver;
2524
import org.elasticsearch.cluster.service.ClusterService;
2625
import org.elasticsearch.cluster.service.MasterServiceTaskQueue;
2726
import org.elasticsearch.common.Priority;
@@ -146,7 +145,7 @@ public Tuple<ClusterState, ClusterStateAckListener> executeTask(
146145
ClusterState clusterState
147146
) throws Exception {
148147

149-
ProjectMetadata projectMetadata = clusterState.projectState(updateSettingsTask.projectId).metadata();
148+
ProjectMetadata projectMetadata = clusterState.metadata().getProject(updateSettingsTask.projectId);
150149
ProjectMetadata.Builder projectMetadataBuilder = ProjectMetadata.builder(projectMetadata);
151150
Map<String, DataStream> dataStreamMap = projectMetadata.dataStreams();
152151
DataStream dataStream = dataStreamMap.get(updateSettingsTask.dataStreamName);
@@ -408,7 +407,7 @@ public static ClusterState setRolloverOnWrite(
408407
}
409408

410409
public void updateSettings(
411-
ProjectResolver projectResolver,
410+
ProjectId projectId,
412411
TimeValue masterNodeTimeout,
413412
TimeValue ackTimeout,
414413
String dataStreamName,
@@ -417,7 +416,7 @@ public void updateSettings(
417416
) {
418417
updateSettingsTaskQueue.submitTask(
419418
"updating settings on data stream",
420-
new UpdateSettingsTask(projectResolver.getProjectId(), dataStreamName, settingsOverrides, ackTimeout, listener),
419+
new UpdateSettingsTask(projectId, dataStreamName, settingsOverrides, ackTimeout, listener),
421420
masterNodeTimeout
422421
);
423422
}

0 commit comments

Comments
 (0)