Address comments

Author: samxbr

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTaskExecutor.java

@@ -231,10 +231,7 @@ public void clusterChanged(ClusterChangedEvent event) {
             // bootstrap task once iff it is not already bootstrapped
             AtomicBoolean taskIsBootstrapped = taskIsBootstrappedByProject.computeIfAbsent(projectId, k -> new AtomicBoolean(false));
             if (taskIsBootstrapped.getAndSet(true) == false) {
-                this.taskIsBootstrappedByProject.computeIfAbsent(
-                    projectId,
-                    k -> new AtomicBoolean(hasAtLeastOneGeoipProcessor(projectMetadata))
-                );
+                atLeastOneGeoipProcessorByProject.computeIfAbsent(projectId, k -> hasAtLeastOneGeoipProcessor(projectMetadata));
                 if (ENABLED_SETTING.get(event.state().getMetadata().settings(), settings)) {
                     logger.debug("Bootstrapping geoip downloader task for project [{}]", projectId);
                     startTask(projectId, () -> taskIsBootstrapped.set(false));
@@ -256,17 +253,19 @@ public void clusterChanged(ClusterChangedEvent event) {
             }
 
             if (hasIngestPipelineChanges || hasIndicesChanges) {
-                var atLeastOneGeoipProcessor = atLeastOneGeoipProcessorByProject.computeIfAbsent(projectId, k -> false);
+                boolean atLeastOneGeoipProcessor = atLeastOneGeoipProcessorByProject.computeIfAbsent(projectId, k -> false);
                 boolean newAtLeastOneGeoipProcessor = hasAtLeastOneGeoipProcessor(projectMetadata);
-
+                // update if necessary
+                if (newAtLeastOneGeoipProcessor != atLeastOneGeoipProcessor) {
+                    atLeastOneGeoipProcessorByProject.put(projectId, newAtLeastOneGeoipProcessor);
+                }
                 if (newAtLeastOneGeoipProcessor && atLeastOneGeoipProcessor == false) {
                     logger.trace("Scheduling runDownloader for project [{}] because a geoip processor has been added", projectId);
                     GeoIpDownloader currentDownloader = getTask(projectId);
                     if (currentDownloader != null) {
                         currentDownloader.requestReschedule();
                     }
                 }
-                atLeastOneGeoipProcessorByProject.put(projectId, newAtLeastOneGeoipProcessor);
             }
         }
     }

server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java

@@ -531,6 +531,7 @@ public void testChangedCustomProjectMetadataSet() {
                 .putProjectMetadata(ProjectMetadata.builder(project2).build())
                 .build();
             ClusterChangedEvent event = new ClusterChangedEvent("_na_", newState, originalState);
+            // IndexGraveyard is always added when a new project is created, this checks that IndexGraveyard is "changed
             assertTrue(event.customMetadataChanged(project2.id(), IndexGraveyard.TYPE));
             assertTrue(event.customMetadataChanged(project2.id(), custom2.getWriteableName()));
             // No change to other project
@@ -545,6 +546,7 @@ public void testChangedCustomProjectMetadataSet() {
             // project2 is removed
             ClusterState newState = originalState;
             ClusterChangedEvent event = new ClusterChangedEvent("_na_", newState, oldState);
+            // IndexGraveyard is always added when a new project is created, this checks that IndexGraveyard is "changed"
             assertTrue(event.customMetadataChanged(project2.id(), IndexGraveyard.TYPE));
             assertTrue(event.customMetadataChanged(project2.id(), custom2.getWriteableName()));
             // No change to other project
@@ -602,6 +604,7 @@ public void testChangedCustomMetadataSetMultiProject() {
             )
             .build();
         event = new ClusterChangedEvent("_na_", originalState, newState);
+        // IndexGraveyard is always added when a new project is created, this checks that IndexGraveyard is "changed"
         assertEquals(Set.of(IndexGraveyard.TYPE, project2Custom.getWriteableName()), event.changedCustomProjectMetadataSet());
     }