Optimize index template registry

Author: nielsbauman

server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.cluster.metadata.IndexGraveyard.IndexGraveyardDiff;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
@@ -122,6 +123,10 @@ public boolean metadataChanged() {
         return state.metadata() != previousState.metadata();
     }
 
+    public boolean projectChanged(ProjectId projectId) {
+        return state.metadata().projects().get(projectId) != previousState.metadata().projects().get(projectId);
+    }
+
     /**
      * Returns a set of custom meta data types when any custom metadata for the cluster has changed
      * between the previous cluster state and the new cluster state. custom meta data types are

test/framework/src/main/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java

@@ -811,4 +811,11 @@ private static Metadata.Builder addHealthNode(Metadata.Builder metadataBuilder,
         tasks.addTask(HealthNode.TASK_NAME, HealthNode.TASK_NAME, HealthNodeTaskParams.INSTANCE, assignment);
         return metadataBuilder.putCustom(ClusterPersistentTasksCustomMetadata.TYPE, tasks.build());
     }
+
+    public static ClusterState stateWithUpdatedProject(ClusterState state, ProjectId projectId) {
+        if (state.metadata().hasProject(projectId)) {
+            return ClusterState.builder(state).putProjectMetadata(ProjectMetadata.builder(state.metadata().getProject(projectId))).build();
+        }
+        return ClusterState.builder(state).putProjectMetadata(ProjectMetadata.builder(projectId)).build();
+    }
 }

x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryRolloverIT.java

@@ -13,15 +13,18 @@
 import org.elasticsearch.action.datastreams.GetDataStreamAction;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.action.support.replication.ClusterStateCreationUtils;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.DataStream;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.datastreams.DataStreamsPlugin;
 import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.test.ClusterServiceUtils;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.xcontent.XContentType;
 import org.junit.Before;
@@ -66,9 +69,16 @@ public void setup() {
     }
 
     public void testRollover() throws Exception {
-        ClusterState state = clusterService.state();
-        registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), state, state));
-        assertBusy(() -> { assertTrue(clusterService.state().metadata().getProject().templatesV2().containsKey(TEST_INDEX_TEMPLATE_ID)); });
+        ClusterState initialState = clusterService.state();
+        final var projectId = Metadata.DEFAULT_PROJECT_ID;
+        final var newState = ClusterStateCreationUtils.stateWithUpdatedProject(initialState, projectId);
+        registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), newState, initialState));
+        ClusterServiceUtils.awaitClusterState(
+            logger,
+            state -> state.metadata().hasProject(projectId)
+                && state.metadata().getProject(projectId).templatesV2().containsKey(TEST_INDEX_TEMPLATE_ID),
+            clusterService
+        );
         String dsName = TEST_INDEX_PATTERN.replace('*', '1');
         CreateDataStreamAction.Request createDataStreamRequest = new CreateDataStreamAction.Request(
             TEST_REQUEST_TIMEOUT,
@@ -79,7 +89,7 @@ public void testRollover() throws Exception {
         assertTrue(acknowledgedResponse.isAcknowledged());
         assertNumberOfBackingIndices(1);
         registry.incrementVersion();
-        registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), clusterService.state(), state));
+        registry.clusterChanged(new ClusterChangedEvent(IndexTemplateRegistryRolloverIT.class.getName(), clusterService.state(), newState));
         assertBusy(() -> assertTrue(getDataStream().rolloverOnWrite()));
         assertNumberOfBackingIndices(1);
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java

@@ -247,6 +247,9 @@ public void clusterChanged(ClusterChangedEvent event) {
             return;
         }
         for (ProjectMetadata project : event.state().metadata().projects().values()) {
+            if (event.projectChanged(project.id()) == false) {
+                continue;
+            }
             addIngestPipelinesIfMissing(project);
             addTemplatesIfMissing(project);
             addIndexLifecyclePoliciesIfMissing(project);

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlIndexTemplateRegistryTests.java

@@ -9,6 +9,7 @@
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.action.support.replication.ClusterStateCreationUtils;
 import org.elasticsearch.client.internal.AdminClient;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.client.internal.IndicesAdminClient;
@@ -17,7 +18,7 @@
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
-import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.project.TestProjectResolvers;
@@ -49,9 +50,6 @@
 
 public class MlIndexTemplateRegistryTests extends ESTestCase {
 
-    private final DiscoveryNode node = DiscoveryNodeUtils.create("node");
-    private final DiscoveryNodes nodes = DiscoveryNodes.builder().localNodeId("node").masterNodeId("node").add(node).build();
-
     private NamedXContentRegistry xContentRegistry;
     private ClusterService clusterService;
     private ThreadPool threadPool;
@@ -96,7 +94,7 @@ public void testStateTemplate() {
             TestProjectResolvers.mustExecuteFirst()
         );
 
-        registry.clusterChanged(createClusterChangedEvent(nodes));
+        registry.clusterChanged(createClusterChangedEvent());
 
         verify(client, times(4)).execute(
             same(TransportPutComposableIndexTemplateAction.TYPE),
@@ -125,7 +123,7 @@ public void testStatsTemplate() {
             TestProjectResolvers.mustExecuteFirst()
         );
 
-        registry.clusterChanged(createClusterChangedEvent(nodes));
+        registry.clusterChanged(createClusterChangedEvent());
 
         verify(client, times(4)).execute(
             same(TransportPutComposableIndexTemplateAction.TYPE),
@@ -152,11 +150,14 @@ private static <Response> Answer<Response> withResponse(Response response) {
         };
     }
 
-    private static ClusterChangedEvent createClusterChangedEvent(DiscoveryNodes nodes) {
+    private static ClusterChangedEvent createClusterChangedEvent() {
+        final var initialState = ClusterState.builder(ClusterName.DEFAULT)
+            .nodes(DiscoveryNodes.builder().localNodeId("node").masterNodeId("node").add(DiscoveryNodeUtils.create("node")).build())
+            .build();
         return new ClusterChangedEvent(
             "created-from-test",
-            ClusterState.builder(new ClusterName("test")).nodes(nodes).build(),
-            ClusterState.builder(new ClusterName("test")).build()
+            ClusterStateCreationUtils.stateWithUpdatedProject(initialState, Metadata.DEFAULT_PROJECT_ID),
+            initialState
         );
     }
 }