Simplify creation checks

Author: nielsbauman

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

@@ -87,12 +87,9 @@ public abstract class IndexTemplateRegistry implements ClusterStateListener {
     protected final ThreadPool threadPool;
     protected final NamedXContentRegistry xContentRegistry;
     protected final ClusterService clusterService;
-    protected final ConcurrentMap<ProjectId, ConcurrentHashMap<String, AtomicBoolean>> templateCreationsInProgress =
-        new ConcurrentHashMap<>();
-    protected final ConcurrentMap<ProjectId, ConcurrentHashMap<String, AtomicBoolean>> policyCreationsInProgress =
-        new ConcurrentHashMap<>();
-    protected final ConcurrentMap<ProjectId, ConcurrentHashMap<String, AtomicBoolean>> pipelineCreationsInProgress =
-        new ConcurrentHashMap<>();
+    protected final ConcurrentMap<String, AtomicBoolean> templateCreationsInProgress = new ConcurrentHashMap<>();
+    protected final ConcurrentMap<String, AtomicBoolean> policyCreationsInProgress = new ConcurrentHashMap<>();
+    protected final ConcurrentMap<String, AtomicBoolean> pipelineCreationsInProgress = new ConcurrentHashMap<>();
     protected final List<LifecyclePolicy> lifecyclePolicies;
     protected final ProjectResolver projectResolver;
 
@@ -247,6 +244,9 @@ public void clusterChanged(ClusterChangedEvent event) {
             return;
         }
         for (ProjectMetadata project : event.state().metadata().projects().values()) {
+            if (project.id() != ProjectId.DEFAULT) {
+                continue;
+            }
             addIngestPipelinesIfMissing(project);
             addTemplatesIfMissing(project);
             addIndexLifecyclePoliciesIfMissing(project);
@@ -284,8 +284,7 @@ private void addLegacyTemplatesIfMissing(ProjectMetadata project) {
         final List<IndexTemplateConfig> indexTemplates = getLegacyTemplateConfigs();
         for (IndexTemplateConfig newTemplate : indexTemplates) {
             final String templateName = newTemplate.getTemplateName();
-            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(project.id(), key -> new ConcurrentHashMap<>())
-                .computeIfAbsent(templateName, key -> new AtomicBoolean(false));
+            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(templateName, key -> new AtomicBoolean(false));
             if (creationCheck.compareAndSet(false, true)) {
                 IndexTemplateMetadata currentTemplate = project.templates().get(templateName);
                 if (Objects.isNull(currentTemplate)) {
@@ -325,8 +324,7 @@ private void addComponentTemplatesIfMissing(ProjectMetadata project) {
         final Map<String, ComponentTemplate> indexTemplates = getComponentTemplateConfigs();
         for (Map.Entry<String, ComponentTemplate> newTemplate : indexTemplates.entrySet()) {
             final String templateName = newTemplate.getKey();
-            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(project.id(), key -> new ConcurrentHashMap<>())
-                .computeIfAbsent(templateName, key -> new AtomicBoolean(false));
+            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(templateName, key -> new AtomicBoolean(false));
             if (creationCheck.compareAndSet(false, true)) {
                 ComponentTemplate currentTemplate = project.componentTemplates().get(templateName);
                 if (templateDependenciesSatisfied(project, newTemplate.getValue()) == false) {
@@ -399,8 +397,7 @@ private void addComposableTemplatesIfMissing(ProjectMetadata project) {
         final Map<String, ComposableIndexTemplate> indexTemplates = getComposableTemplateConfigs();
         for (Map.Entry<String, ComposableIndexTemplate> newTemplate : indexTemplates.entrySet()) {
             final String templateName = newTemplate.getKey();
-            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(project.id(), key -> new ConcurrentHashMap<>())
-                .computeIfAbsent(templateName, key -> new AtomicBoolean(false));
+            final AtomicBoolean creationCheck = templateCreationsInProgress.computeIfAbsent(templateName, key -> new AtomicBoolean(false));
             if (creationCheck.compareAndSet(false, true)) {
                 ComposableIndexTemplate currentTemplate = project.templatesV2().get(templateName);
                 boolean componentTemplatesAvailable = componentTemplatesInstalled(project, newTemplate.getValue());
@@ -605,8 +602,10 @@ private void addIndexLifecyclePoliciesIfMissing(ProjectMetadata project) {
         final IndexLifecycleMetadata metadata = project.custom(IndexLifecycleMetadata.TYPE);
         final Map<String, LifecyclePolicy> policies = metadata != null ? metadata.getPolicies() : Map.of();
         for (LifecyclePolicy policy : getLifecyclePolicies()) {
-            final AtomicBoolean creationCheck = policyCreationsInProgress.computeIfAbsent(project.id(), key -> new ConcurrentHashMap<>())
-                .computeIfAbsent(policy.getName(), key -> new AtomicBoolean(false));
+            final AtomicBoolean creationCheck = policyCreationsInProgress.computeIfAbsent(
+                policy.getName(),
+                key -> new AtomicBoolean(false)
+            );
             if (creationCheck.compareAndSet(false, true)) {
                 final LifecyclePolicy currentPolicy = policies.get(policy.getName());
                 if (Objects.isNull(currentPolicy)) {
@@ -679,8 +678,10 @@ protected static Map<String, ComposableIndexTemplate> parseComposableTemplates(I
 
     private void addIngestPipelinesIfMissing(ProjectMetadata project) {
         for (IngestPipelineConfig requiredPipeline : getIngestPipelines()) {
-            final AtomicBoolean creationCheck = pipelineCreationsInProgress.computeIfAbsent(project.id(), key -> new ConcurrentHashMap<>())
-                .computeIfAbsent(requiredPipeline.getId(), key -> new AtomicBoolean(false));
+            final AtomicBoolean creationCheck = pipelineCreationsInProgress.computeIfAbsent(
+                requiredPipeline.getId(),
+                key -> new AtomicBoolean(false)
+            );
 
             if (creationCheck.compareAndSet(false, true)) {
                 List<String> pipelineDependencies = requiredPipeline.getPipelineDependencies();

x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle

@@ -10,7 +10,6 @@ dependencies {
   testImplementation(testArtifact(project(":x-pack:plugin:security:qa:service-account"), "javaRestTest"))
   restXpackTestConfig project(path: ':x-pack:plugin:ilm:qa:rest', configuration: "basicRestSpecs")
   restXpackTestConfig project(path: ':x-pack:plugin:downsample:qa:rest', configuration: "basicRestSpecs")
-  restXpackTestConfig project(path: ':x-pack:plugin:stack', configuration: "basicRestSpecs")
 }
 
 // let the yamlRestTests see the classpath of test