Add FixForMultiProject and other fix

Author: samxbr

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

@@ -29,7 +29,9 @@
 import org.elasticsearch.common.logging.HeaderWarning;
 import org.elasticsearch.core.CheckedConsumer;
 import org.elasticsearch.core.CheckedRunnable;
+import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.core.IOUtils;
+import org.elasticsearch.core.NotMultiProjectCapable;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.env.Environment;
@@ -289,15 +291,12 @@ void checkDatabases(ClusterState state) {
         }
 
         // Optimization: only load the .geoip_databases for projects that are allocated to this node
-        for (ProjectId projectId : state.metadata().projects().keySet()) {
-            checkDatabases(state.projectState(projectId));
-        }
+        state.forEachProject(this::checkDatabases);
     }
 
     void checkDatabases(ProjectState projectState) {
         ProjectId projectId = projectState.projectId();
         ProjectMetadata projectMetadata = projectState.metadata();
-        ClusterState clusterState = projectState.cluster();
         PersistentTasksCustomMetadata persistentTasks = projectMetadata.custom(PersistentTasksCustomMetadata.TYPE);
         if (persistentTasks == null) {
             logger.trace("Not checking databases for project [{}] because persistent tasks are null", projectId);
@@ -343,7 +342,10 @@ void checkDatabases(ProjectState projectState) {
 
         // process the geoip task state for the enterprise geoip downloader
         {
-            EnterpriseGeoIpTaskState taskState = getEnterpriseGeoIpTaskState(projectState.cluster());
+            @NotMultiProjectCapable(description = "Enterprise GeoIP not supported in serverless")
+            EnterpriseGeoIpTaskState taskState = getEnterpriseGeoIpTaskState(
+                projectState.cluster().metadata().getProject(ProjectId.DEFAULT)
+            );
             if (taskState == null) {
                 // Note: an empty state will purge stale entries in databases map
                 taskState = EnterpriseGeoIpTaskState.EMPTY;

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

@@ -11,12 +11,10 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.VersionedNamedWriteable;
-import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.ingest.EnterpriseGeoIpTask;
@@ -148,10 +146,9 @@ public void writeTo(StreamOutput out) throws IOException {
      * @return the geoip downloader's task state or null if there is not a state to read
      */
     @Nullable
-    @FixForMultiProject(description = "Replace ProjectId.DEFAULT")
-    static EnterpriseGeoIpTaskState getEnterpriseGeoIpTaskState(ClusterState state) {
+    static EnterpriseGeoIpTaskState getEnterpriseGeoIpTaskState(ProjectMetadata projectMetadata) {
         PersistentTasksCustomMetadata.PersistentTask<?> task = getTaskWithId(
-            state.metadata().getProject(ProjectId.DEFAULT),
+            projectMetadata,
             EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER
         );
         return (task == null) ? null : (EnterpriseGeoIpTaskState) task.getState();

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

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.VersionedNamedWriteable;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
@@ -214,6 +215,7 @@ public boolean isCloseToExpiration() {
         private static final TimeValue THIRTY_DAYS = TimeValue.timeValueDays(30);
         private static final long THIRTY_DAYS_MILLIS = THIRTY_DAYS.millis();
 
+        @FixForMultiProject(description = "Replace caller from cluster settings to project settings")
         public boolean isNewEnough(Settings settings) {
             // micro optimization: this looks a little silly, but the expected case is that database_validity is only used in tests.
             // we run this code on every document, though, so the argument checking and other bits that getAsTime does is enough