Project deletion via file-based settings

Author: alexey-ivanov-es

server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

@@ -78,6 +78,10 @@ public static Settings getProjectSettings(ProjectId projectId, ClusterState clus
         return registry.projectsSettings.getOrDefault(projectId, Settings.EMPTY);
     }
 
+    public boolean isProjectMarkedForDeletion(ProjectId projectId) {
+        return projectsMarkedForDeletion.contains(projectId);
+    }
+
     @Override
     public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params) {
         boolean multiProject = params.paramAsBoolean("multi-project", false);

server/src/main/java/org/elasticsearch/reservedstate/service/ReservedProjectStateUpdateTask.java

@@ -15,7 +15,6 @@
 import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.project.ProjectStateRegistry;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.reservedstate.ReservedProjectStateHandler;
 import org.elasticsearch.reservedstate.TransformState;
@@ -73,14 +72,14 @@ protected ClusterState execute(ClusterState currentState) {
         }
 
         ClusterState updatedClusterState = result.v1();
-        Settings updatedSettings = ProjectStateRegistry.getProjectSettings(projectId, updatedClusterState);
-        ProjectMetadata updatedProject = updatedClusterState.getMetadata().getProject(projectId);
+        ProjectStateRegistry updatedProjectStateRegistry = updatedClusterState.custom(
+            ProjectStateRegistry.TYPE,
+            ProjectStateRegistry.EMPTY
+        );
+        ProjectMetadata updatedProjectMetadata = updatedClusterState.getMetadata().getProject(projectId);
         return ClusterState.builder(currentState)
-            .putCustom(
-                ProjectStateRegistry.TYPE,
-                ProjectStateRegistry.builder(currentState).putProjectSettings(projectId, updatedSettings).build()
-            )
-            .putProjectMetadata(ProjectMetadata.builder(updatedProject).put(result.v2()))
+            .putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder(updatedProjectStateRegistry).build())
+            .putProjectMetadata(ProjectMetadata.builder(updatedProjectMetadata).put(result.v2()))
             .build();
     }
 }