Remove unnecessary changes related to copying custom index metadata

Author: felixbarny

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java

@@ -437,7 +437,6 @@ yield new DataStreamAutoShardingEvent(
                         )
                     );
                 },
-                metadataBuilder -> {},
                 rerouteCompletionIsNotRequired()
             );
         }

server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java

@@ -224,8 +224,6 @@ public static ProjectMetadata resolveTemporaryState(
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
             .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
             .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
-            // avoid validation errors due to missing routing path
-            .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "dummy_path")
             .build();
 
         final IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
@@ -277,7 +275,6 @@ public static Template resolveTemplate(
 
         // First apply settings sourced from index settings providers
         final var now = Instant.now();
-        IndexMetadata.Builder indexMetadataBuilder = IndexMetadata.builder(indexName);
         Settings.Builder additionalSettings = Settings.builder();
         Set<String> overrulingSettings = new HashSet<>();
         for (var provider : indexSettingProviders) {
@@ -291,7 +288,7 @@ public static Template resolveTemplate(
                 templateSettings,
                 mappings,
                 builder,
-                indexMetadataBuilder::putCustom
+                (k, v) -> {}
             );
             Settings result = builder.build();
             MetadataCreateIndexService.validateAdditionalSettings(provider, result, additionalSettings);
@@ -314,7 +311,8 @@ public static Template resolveTemplate(
         // Apply settings resolved from templates.
         dummySettings.put(templateSettings);
 
-        final IndexMetadata indexMetadata = indexMetadataBuilder.eventIngestedRange(getEventIngestedRange(indexName, simulatedProject))
+        final IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
+            .eventIngestedRange(getEventIngestedRange(indexName, simulatedProject))
             .settings(dummySettings)
             .build();
 

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

@@ -445,7 +445,6 @@ public static ClusterState createFailureStoreIndex(
                 createIndexRequest,
                 false,
                 metadataTransformer,
-                metadataBuilder -> {},
                 AllocationActionListener.rerouteCompletionIsNotRequired()
             );
         } catch (ResourceAlreadyExistsException e) {

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

@@ -101,7 +101,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -350,7 +349,7 @@ private void onlyCreateIndex(
 
                 @Override
                 public ClusterState execute(ClusterState currentState) throws Exception {
-                    return applyCreateIndexRequest(currentState, request, false, null, metadataBuilder -> {}, delegate.reroute());
+                    return applyCreateIndexRequest(currentState, request, false, null, delegate.reroute());
                 }
 
                 @Override
@@ -389,7 +388,6 @@ public ClusterState applyCreateIndexRequest(
         CreateIndexClusterStateUpdateRequest request,
         boolean silent,
         BiConsumer<ProjectMetadata.Builder, IndexMetadata> metadataTransformer,
-        Consumer<IndexMetadata.Builder> indexMetadataTransformer,
         ActionListener<Void> rerouteListener
     ) throws Exception {
 
@@ -499,7 +497,6 @@ public ClusterState applyCreateIndexRequest(
                     silent,
                     v1Templates,
                     metadataTransformer,
-                    indexMetadataTransformer,
                     rerouteListener
                 );
             }
@@ -512,7 +509,7 @@ public ClusterState applyCreateIndexRequest(
         boolean silent,
         ActionListener<Void> rerouteListener
     ) throws Exception {
-        return applyCreateIndexRequest(currentState, request, silent, null, metadataBuilder -> {}, rerouteListener);
+        return applyCreateIndexRequest(currentState, request, silent, null, rerouteListener);
     }
 
     /**
@@ -614,8 +611,7 @@ private IndexMetadata buildAndValidateTemporaryIndexMetadata(
         final Settings aggregatedIndexSettings,
         final CreateIndexClusterStateUpdateRequest request,
         final int routingNumShards,
-        final ImmutableOpenMap.Builder<String, Map<String, String>> customMetadataBuilder,
-        final Consumer<IndexMetadata.Builder> indexMetadataTransformer
+        ImmutableOpenMap.Builder<String, Map<String, String>> customMetadataBuilder
     ) {
 
         final boolean isHiddenAfterTemplates = IndexMetadata.INDEX_HIDDEN_SETTING.get(aggregatedIndexSettings);
@@ -631,7 +627,6 @@ private IndexMetadata buildAndValidateTemporaryIndexMetadata(
         tmpImdBuilder.settings(indexSettings);
         tmpImdBuilder.system(isSystem);
         tmpImdBuilder.putCustom(customMetadataBuilder.build());
-        indexMetadataTransformer.accept(tmpImdBuilder);
 
         // Set up everything, now locally create the index to see that things are ok, and apply
         IndexMetadata tempMetadata = tmpImdBuilder.build();
@@ -647,7 +642,6 @@ private ClusterState applyCreateIndexRequestWithV1Templates(
         final boolean silent,
         final List<IndexTemplateMetadata> templates,
         final BiConsumer<ProjectMetadata.Builder, IndexMetadata> projectMetadataTransformer,
-        final Consumer<IndexMetadata.Builder> indexMetadataTransformer,
         final ActionListener<Void> rerouteListener
     ) throws Exception {
         logger.debug(
@@ -694,8 +688,7 @@ private ClusterState applyCreateIndexRequestWithV1Templates(
             aggregatedIndexSettings,
             request,
             routingNumShards,
-            customMetadataBuilder,
-            indexMetadataTransformer
+            customMetadataBuilder
         );
 
         return applyCreateIndexWithTemporaryService(
@@ -795,8 +788,7 @@ private ClusterState applyCreateIndexRequestWithV2Template(
             aggregatedIndexSettings,
             request,
             routingNumShards,
-            customMetadataBuilder,
-            metadataBuilder -> {}
+            customMetadataBuilder
         );
 
         return applyCreateIndexWithTemporaryService(
@@ -858,8 +850,7 @@ private ClusterState applyCreateIndexRequestForSystemIndex(
             aggregatedIndexSettings,
             request,
             routingNumShards,
-            customMetadataBuilder,
-            metadataBuilder -> {}
+            customMetadataBuilder
         );
 
         return applyCreateIndexWithTemporaryService(
@@ -933,8 +924,7 @@ private ClusterState applyCreateIndexRequestForSystemDataStream(
             aggregatedIndexSettings,
             request,
             routingNumShards,
-            customMetadataBuilder,
-            metadataBuilder -> {}
+            customMetadataBuilder
         );
 
         return applyCreateIndexWithTemporaryService(
@@ -1050,8 +1040,7 @@ private ClusterState applyCreateIndexRequestWithExistingMetadata(
             aggregatedIndexSettings,
             request,
             routingNumShards,
-            customMetadataBuilder,
-            metadataBuilder -> metadataBuilder.putCustom(sourceMetadata.getCustomData())
+            customMetadataBuilder
         );
 
         return applyCreateIndexWithTemporaryService(

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

@@ -2056,7 +2056,7 @@ public static void validateTemplate(Settings validateSettings, CompressedXConten
         });
     }
 
-    private void validate(String name, ComponentTemplate template) {
+    public void validate(String name, ComponentTemplate template) {
         validate(name, template.template(), Collections.emptyList());
     }
 

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java

@@ -599,7 +599,6 @@ private static MetadataCreateIndexService getMetadataCreateIndexService() throws
                 any(CreateIndexClusterStateUpdateRequest.class),
                 anyBoolean(),
                 any(),
-                any(),
                 any()
             )
         ).thenAnswer(objectAnswer);

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/TransportDownsampleAction.java

@@ -977,7 +977,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                     true,
                     // Copy index metadata from source index to downsample index
                     (builder, indexMetadata) -> builder.put(copyIndexMetadata(sourceIndexMetadata, indexMetadata, indexScopedSettings)),
-                    metadataBuilder -> {},
                     delegate.reroute()
                 );
             }