cleanup

Author: pxsalehi

server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java

@@ -72,8 +72,7 @@ public Set<ClusterBlock> global() {
         return global;
     }
 
-    // Review note: project-aware flavor of global() used in TransportSearch and TransportFieldCaps
-    // which were already project-aware
+    // Project-aware flavor of global() used to find global or project-global blocks for a specific project.
     public Set<ClusterBlock> global(ProjectId projectId) {
         return Sets.union(global, projectBlocks(projectId).projectGlobals());
     }
@@ -99,7 +98,6 @@ public Set<ClusterBlock> global(ClusterBlockLevel level) {
     }
 
     // For a specific project, global could be either project global or cluster global
-    // Review note: changed TransportAddIndexBlock to use this since it is project-aware
     public Set<ClusterBlock> global(ProjectId projectId, ClusterBlockLevel level) {
         var levelHolder = levelHolders.get(level);
         return Sets.union(levelHolder.global, levelHolder.projects.getOrDefault(projectId, ProjectBlocks.EMPTY).projectGlobals());
@@ -163,9 +161,6 @@ public boolean disableStatePersistence() {
         return false;
     }
 
-    // Review note: seems to be used only with STATE_NOT_RECOVERED by different node-level services. May or may not need to
-    // consider project globals once/if we have a project block that is similar to STATE_NOT_RECOVERED for project creation/resurrection
-    // time (essentially something similar to PROJECT_UNDER_DELETION_BLOCK, but retryable).
     public boolean hasGlobalBlock(ClusterBlock block) {
         return global.contains(block);
     }
@@ -179,12 +174,10 @@ public boolean hasGlobalBlockWithId(final int blockId) {
         return false;
     }
 
-    // Review note: used by monitoring/localExporter and watcher, both currently not project aware.
     public boolean hasGlobalBlockWithLevel(ClusterBlockLevel level) {
         return global(level).size() > 0;
     }
 
-    // Review note: Used by TransportAbstractBulk which is already project-aware
     public boolean hasGlobalBlockWithLevel(ProjectId projectId, ClusterBlockLevel level) {
         return global(projectId, level).size() > 0;
     }
@@ -207,7 +200,6 @@ public boolean hasIndexBlock(String index, ClusterBlock block) {
         return hasIndexBlock(Metadata.DEFAULT_PROJECT_ID, index, block);
     }
 
-    // Review note: Not changing index-specific checks.
     public boolean hasIndexBlock(ProjectId projectId, String index, ClusterBlock block) {
         final var projectBlocks = projectBlocksMap.get(projectId);
         if (projectBlocks == null) {
@@ -220,7 +212,6 @@ public boolean hasIndexBlock(ProjectId projectId, String index, ClusterBlock blo
         return clusterBlocks.contains(block);
     }
 
-    // Review note: Not changing index-specific checks.
     public boolean hasIndexBlockLevel(ProjectId projectId, String index, ClusterBlockLevel level) {
         return blocksForIndex(projectId, level, index).isEmpty() == false;
     }
@@ -229,7 +220,6 @@ public boolean hasIndexBlockWithId(ProjectId projectId, String index, int blockI
         return getIndexBlockWithId(projectId, index, blockId) != null;
     }
 
-    // Review note: Not changing index-specific checks.
     @Nullable
     public ClusterBlock getIndexBlockWithId(final ProjectId projectId, final String index, final int blockId) {
         final var projectBlocks = projectBlocksMap.get(projectId);
@@ -246,15 +236,13 @@ public ClusterBlock getIndexBlockWithId(final ProjectId projectId, final String
         return null;
     }
 
-    // Review note: only a watcher action uses this since it is not project-aware
     public void globalBlockedRaiseException(ClusterBlockLevel level) throws ClusterBlockException {
         ClusterBlockException blockException = globalBlockedException(level);
         if (blockException != null) {
             throw blockException;
         }
     }
 
-    // Review note: All new callers seemed project-aware/scoped actions.
     public void globalBlockedRaiseException(ProjectId projectId, ClusterBlockLevel level) throws ClusterBlockException {
         ClusterBlockException blockException = globalBlockedException(projectId, level);
         if (blockException != null) {
@@ -270,10 +258,6 @@ private boolean globalBlocked(ProjectId projectId, ClusterBlockLevel level) {
         return global(projectId, level).isEmpty() == false;
     }
 
-    // Review note: this has some 200 callers mostly Transport actions. Not sure but maybe I have to
-    // review callers and update those that are project-scoped. TransportGetDataStreamLifecycle is one example
-    // that i've updated here, although many don't seem to be user facing or available
-    // directly in serverless. Could also be a follow up to update the callers.
     public ClusterBlockException globalBlockedException(ClusterBlockLevel level) {
         if (globalBlocked(level) == false) {
             return null;