pulling out UpdateSingleIndexSettingsListener into its own class

Author: masseyke

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

@@ -324,7 +324,7 @@ private void updateSettingsOnSingleIndex(
             if (dryRun) {
                 /*
                  * This is as far as we go with dry run mode. We get the benefit of having checked that all the indices that will be touced
-                 * are not blocked, but there is no value in going behond this. So just respond to the listener and move on.
+                 * are not blocked, but there is no value in going beyond this. So just respond to the listener and move on.
                  */
                 listener.onResponse(null);
             } else {
@@ -338,35 +338,37 @@ private void updateSettingsOnSingleIndex(
                         UpdateSettingsClusterStateUpdateRequest.OnStaticSetting.REOPEN_INDICES,
                         index
                     ),
-                    new ActionListener<>() {
-                        @Override
-                        public void onResponse(AcknowledgedResponse response) {
-                            UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError error;
-                            if (response.isAcknowledged() == false) {
-                                error = new UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError(
-                                    index.getName(),
-                                    "Updating settings not acknowledged for unknown reason"
-                                );
-                            } else {
-                                error = null;
-                            }
-                            listener.onResponse(error);
-                        }
+                    new UpdateSingleIndexSettingsListener(index.getName(), listener)
+                );
+            }
+        }
 
-                        @Override
-                        public void onFailure(Exception e) {
-                            listener.onResponse(
-                                new UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError(
-                                    index.getName(),
-                                    e.getMessage()
-                                )
-                            );
-                        }
-                    }
+    }
+
+    private record UpdateSingleIndexSettingsListener(
+        String indexName,
+        ActionListener<UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError> delegateListener
+    ) implements ActionListener<AcknowledgedResponse> {
+        @Override
+        public void onResponse(AcknowledgedResponse response) {
+            UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError error;
+            if (response.isAcknowledged() == false) {
+                error = new UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError(
+                    indexName,
+                    "Updating settings not acknowledged for unknown reason"
                 );
+            } else {
+                error = null;
             }
+            delegateListener.onResponse(error);
         }
 
+        @Override
+        public void onFailure(Exception e) {
+            delegateListener.onResponse(
+                new UpdateDataStreamSettingsAction.DataStreamSettingsResponse.IndexSettingError(indexName, e.getMessage())
+            );
+        }
     }
 
     @Override

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

@@ -151,11 +151,16 @@ public Tuple<ClusterState, ClusterStateAckListener> executeTask(
                     updateSettingsTask.settingsOverrides,
                     clusterState
                 );
-                ProjectMetadata projectMetadata = clusterState.metadata().getProject(updateSettingsTask.projectId);
-                ProjectMetadata.Builder projectMetadataBuilder = ProjectMetadata.builder(projectMetadata);
-                projectMetadataBuilder.removeDataStream(updateSettingsTask.dataStreamName);
-                projectMetadataBuilder.put(dataStream);
-                ClusterState updatedClusterState = ClusterState.builder(clusterState).putProjectMetadata(projectMetadataBuilder).build();
+                final ClusterState updatedClusterState;
+                if (updateSettingsTask.dryRun) {
+                    updatedClusterState = clusterState;
+                } else {
+                    ProjectMetadata projectMetadata = clusterState.metadata().getProject(updateSettingsTask.projectId);
+                    ProjectMetadata.Builder projectMetadataBuilder = ProjectMetadata.builder(projectMetadata);
+                    projectMetadataBuilder.removeDataStream(updateSettingsTask.dataStreamName);
+                    projectMetadataBuilder.put(dataStream);
+                    updatedClusterState = ClusterState.builder(clusterState).putProjectMetadata(projectMetadataBuilder).build();
+                }
                 return new Tuple<>(updatedClusterState, updateSettingsTask);
             }
         };
@@ -410,33 +415,16 @@ public void updateSettings(
         boolean dryRun,
         ActionListener<DataStream> listener
     ) {
-        if (dryRun) {
-            /*
-             * If this is a dry run, we'll do the settings validation and apply the changes to the data stream locally, but we won't run
-             * the task that actually updates the cluster state.
-             */
-            try {
-                DataStream updatedDataStream = createDataStreamForUpdatedDataStreamSettings(
-                    projectId,
-                    dataStreamName,
-                    settingsOverrides,
-                    clusterService.state()
-                );
-                listener.onResponse(updatedDataStream);
-            } catch (Exception e) {
-                listener.onFailure(e);
-            }
-        } else {
-            UpdateSettingsTask updateSettingsTask = new UpdateSettingsTask(
-                projectId,
-                dataStreamName,
-                settingsOverrides,
-                clusterService,
-                ackTimeout,
-                listener
-            );
-            updateSettingsTaskQueue.submitTask("updating settings on data stream", updateSettingsTask, masterNodeTimeout);
-        }
+        UpdateSettingsTask updateSettingsTask = new UpdateSettingsTask(
+            projectId,
+            dataStreamName,
+            settingsOverrides,
+            dryRun,
+            clusterService,
+            ackTimeout,
+            listener
+        );
+        updateSettingsTaskQueue.submitTask("updating settings on data stream", updateSettingsTask, masterNodeTimeout);
     }
 
     /*
@@ -562,8 +550,8 @@ private static IndexAbstraction validateIndex(ProjectMetadata project, String in
      * Removes the given data stream and their backing indices from the Project State.
      *
      * @param projectState The project state
-     * @param dataStreams  The data streams to remove
-     * @param settings     The settings
+     * @param dataStreams The data streams to remove
+     * @param settings The settings
      * @return The updated Project State
      */
     public static ClusterState deleteDataStreams(ProjectState projectState, Set<DataStream> dataStreams, Settings settings) {
@@ -719,11 +707,13 @@ static class UpdateSettingsTask extends AckedBatchedClusterStateUpdateTask {
         final ProjectId projectId;
         private final String dataStreamName;
         private final Settings settingsOverrides;
+        private final boolean dryRun;
 
         UpdateSettingsTask(
             ProjectId projectId,
             String dataStreamName,
             Settings settingsOverrides,
+            boolean dryRun,
             ClusterService clusterService,
             TimeValue ackTimeout,
             ActionListener<DataStream> listener
@@ -738,6 +728,7 @@ static class UpdateSettingsTask extends AckedBatchedClusterStateUpdateTask {
             this.projectId = projectId;
             this.dataStreamName = dataStreamName;
             this.settingsOverrides = settingsOverrides;
+            this.dryRun = dryRun;
         }
     }
 }