Make ILM IndexNameGenerator project-aware

Since this method needs to access both the routing table and the
metadata, we need to make use of the `ProjectState` here.

Author: nielsbauman

server/src/main/java/org/elasticsearch/common/IndexNameGenerator.java

@@ -10,7 +10,7 @@
 package org.elasticsearch.common;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.ProjectState;
 import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.indices.InvalidIndexNameException;
@@ -60,17 +60,17 @@ public static String generateValidIndexSuffix(Supplier<String> randomGenerator)
      * Returns null for valid indices.
      */
     @Nullable
-    public static ActionRequestValidationException validateGeneratedIndexName(String generatedIndexName, ClusterState state) {
+    public static ActionRequestValidationException validateGeneratedIndexName(String generatedIndexName, ProjectState projectState) {
         ActionRequestValidationException err = new ActionRequestValidationException();
         try {
             MetadataCreateIndexService.validateIndexOrAliasName(generatedIndexName, InvalidIndexNameException::new);
         } catch (InvalidIndexNameException e) {
             err.addValidationError(e.getMessage());
         }
-        if (state.routingTable().hasIndex(generatedIndexName) || state.metadata().getProject().hasIndex(generatedIndexName)) {
+        if (projectState.routingTable().hasIndex(generatedIndexName) || projectState.metadata().hasIndex(generatedIndexName)) {
             err.addValidationError("the index name we generated [" + generatedIndexName + "] already exists");
         }
-        if (state.metadata().getProject().hasAlias(generatedIndexName)) {
+        if (projectState.metadata().hasAlias(generatedIndexName)) {
             err.addValidationError("the index name we generated [" + generatedIndexName + "] already exists as alias");
         }
 

server/src/test/java/org/elasticsearch/common/IndexNameGeneratorTests.java

@@ -12,11 +12,12 @@
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.ProjectState;
 import org.elasticsearch.cluster.TestShardRoutingRoleStrategies;
 import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.indices.InvalidIndexNameException;
@@ -75,20 +76,15 @@ public void testGenerateValidIndexSuffix() {
 
     public void testValidateGeneratedIndexName() {
         {
-            assertThat(
-                validateGeneratedIndexName(
-                    generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150)),
-                    ClusterState.EMPTY_STATE
-                ),
-                nullValue()
-            );
+            String generatedIndexName = generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150));
+            assertThat(validateGeneratedIndexName(generatedIndexName, createState(generatedIndexName, false, false, false)), nullValue());
         }
 
         {
             // index name is validated (invalid chars etc)
             String generatedIndexName = generateValidIndexName("_prefix-", randomAlphaOfLengthBetween(5, 150));
             assertThat(
-                validateGeneratedIndexName(generatedIndexName, ClusterState.EMPTY_STATE).validationErrors(),
+                validateGeneratedIndexName(generatedIndexName, createState(generatedIndexName, false, false, false)).validationErrors(),
                 containsInAnyOrder("Invalid index name [" + generatedIndexName + "], must not start with '_', '-', or '+'")
             );
         }
@@ -97,24 +93,18 @@ public void testValidateGeneratedIndexName() {
             // index name is validated (invalid chars etc)
             String generatedIndexName = generateValidIndexName("shrink-", "shrink-indexName-random###");
             assertThat(
-                validateGeneratedIndexName(generatedIndexName, ClusterState.EMPTY_STATE).validationErrors(),
+                validateGeneratedIndexName(generatedIndexName, createState(generatedIndexName, false, false, false)).validationErrors(),
                 containsInAnyOrder("Invalid index name [" + generatedIndexName + "], must not contain '#'")
             );
         }
 
         {
             // generated index already exists as a standalone index
             String generatedIndexName = generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150));
-            IndexMetadata indexMetadata = IndexMetadata.builder(generatedIndexName)
-                .settings(settings(IndexVersion.current()))
-                .numberOfShards(randomIntBetween(1, 5))
-                .numberOfReplicas(randomIntBetween(1, 5))
-                .build();
-            ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT)
-                .metadata(Metadata.builder().put(indexMetadata, false))
-                .build();
-
-            ActionRequestValidationException validationException = validateGeneratedIndexName(generatedIndexName, clusterState);
+            ActionRequestValidationException validationException = validateGeneratedIndexName(
+                generatedIndexName,
+                createState(generatedIndexName, true, false, false)
+            );
             assertThat(validationException, notNullValue());
             assertThat(
                 validationException.validationErrors(),
@@ -125,17 +115,24 @@ public void testValidateGeneratedIndexName() {
         {
             // generated index name already exists as an index (cluster state routing table is also populated)
             String generatedIndexName = generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150));
-            IndexMetadata indexMetadata = IndexMetadata.builder(generatedIndexName)
-                .settings(settings(IndexVersion.current()))
-                .numberOfShards(randomIntBetween(1, 5))
-                .numberOfReplicas(randomIntBetween(1, 5))
-                .build();
-            ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT)
-                .routingTable(RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY).addAsNew(indexMetadata).build())
-                .metadata(Metadata.builder().put(indexMetadata, false))
-                .build();
-
-            ActionRequestValidationException validationException = validateGeneratedIndexName(generatedIndexName, clusterState);
+            ActionRequestValidationException validationException = validateGeneratedIndexName(
+                generatedIndexName,
+                createState(generatedIndexName, true, true, false)
+            );
+            assertThat(validationException, notNullValue());
+            assertThat(
+                validationException.validationErrors(),
+                containsInAnyOrder("the index name we generated [" + generatedIndexName + "] already exists")
+            );
+        }
+
+        {
+            // generated index name already exists as an index but only in routing table
+            String generatedIndexName = generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150));
+            ActionRequestValidationException validationException = validateGeneratedIndexName(
+                generatedIndexName,
+                createState(generatedIndexName, false, true, false)
+            );
             assertThat(validationException, notNullValue());
             assertThat(
                 validationException.validationErrors(),
@@ -146,22 +143,40 @@ public void testValidateGeneratedIndexName() {
         {
             // generated index name already exists as an alias to another index
             String generatedIndexName = generateValidIndexName(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 150));
-            IndexMetadata indexMetadata = IndexMetadata.builder(randomAlphaOfLengthBetween(10, 30))
-                .settings(settings(IndexVersion.current()))
-                .numberOfShards(randomIntBetween(1, 5))
-                .numberOfReplicas(randomIntBetween(1, 5))
-                .putAlias(AliasMetadata.builder(generatedIndexName).build())
-                .build();
-            ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT)
-                .metadata(Metadata.builder().put(indexMetadata, false))
-                .build();
-
-            ActionRequestValidationException validationException = validateGeneratedIndexName(generatedIndexName, clusterState);
+            ActionRequestValidationException validationException = validateGeneratedIndexName(
+                generatedIndexName,
+                createState(generatedIndexName, true, false, true)
+            );
             assertThat(validationException, notNullValue());
             assertThat(
                 validationException.validationErrors(),
                 containsInAnyOrder("the index name we generated [" + generatedIndexName + "] already exists as alias")
             );
         }
     }
+
+    private ProjectState createState(String generatedName, boolean addIndexToMetadata, boolean addIndexToRoutingTable, boolean addAlias) {
+        final var indexName = addAlias ? randomAlphaOfLengthBetween(10, 30) : generatedName;
+        final var indexMetadataBuilder = IndexMetadata.builder(indexName)
+            .settings(settings(IndexVersion.current()))
+            .numberOfShards(randomIntBetween(1, 5))
+            .numberOfReplicas(randomIntBetween(1, 5));
+        if (addAlias) {
+            indexMetadataBuilder.putAlias(AliasMetadata.builder(generatedName).build());
+        }
+        final var indexMetadata = indexMetadataBuilder.build();
+        final var projectId = randomProjectIdOrDefault();
+        final var projectBuilder = ProjectMetadata.builder(projectId);
+        final var clusterStateBuilder = ClusterState.builder(ClusterName.DEFAULT);
+        if (addIndexToMetadata) {
+            projectBuilder.put(indexMetadata, false);
+        }
+        if (addIndexToRoutingTable) {
+            clusterStateBuilder.putRoutingTable(
+                projectId,
+                RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY).addAsNew(indexMetadata).build()
+            );
+        }
+        return clusterStateBuilder.putProjectMetadata(projectBuilder).build().projectState(projectId);
+    }
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/GenerateUniqueIndexNameStep.java

@@ -74,7 +74,7 @@ public ClusterState performAction(Index index, ClusterState clusterState) {
         Builder newLifecycleState = LifecycleExecutionState.builder(lifecycleState);
         String policyName = indexMetadata.getLifecyclePolicyName();
         String generatedIndexName = generateIndexName(prefix, index.getName());
-        ActionRequestValidationException validationException = validateGeneratedIndexName(generatedIndexName, clusterState);
+        ActionRequestValidationException validationException = validateGeneratedIndexName(generatedIndexName, clusterState.projectState());
         if (validationException != null) {
             logger.warn(
                 "unable to generate a valid index name as part of policy [{}] for index [{}] due to [{}]",