Make TransportUnpromotableShardRefreshAction multi-project-compatible (elastic#142354)

Author: benchaplin

server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportUnpromotableShardRefreshAction.java

@@ -19,9 +19,12 @@
 import org.elasticsearch.cluster.action.shard.ShardStateAction;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.injection.guice.Inject;
@@ -111,8 +114,11 @@ private void beforeDispatchingRequestToUnpromotableShards(UnpromotableShardRefre
         }
 
         var clusterStateObserver = new ClusterStateObserver(clusterService, request.getTimeout(), logger, threadPool.getThreadContext());
+        var state = clusterStateObserver.setAndGetObservedState();
+        var index = request.shardId().getIndex();
+        ProjectMetadata projectMetadata = state.metadata().lookupProject(index).orElse(null);
 
-        if (isIndexBlockedForRefresh(request.shardId().getIndexName(), clusterStateObserver.setAndGetObservedState()) == false) {
+        if (isIndexBlockedForRefresh(projectMetadata, index, state) == false) {
             listener.onResponse(null);
             return;
         }
@@ -133,15 +139,18 @@ public void onTimeout(TimeValue timeout) {
                 listener.onFailure(
                     new ElasticsearchTimeoutException(
                         "shard refresh timed out waiting for index block to be removed",
-                        new ClusterBlockException(Map.of(request.shardId().getIndexName(), Set.of(INDEX_REFRESH_BLOCK)))
+                        new ClusterBlockException(Map.of(index.getName(), Set.of(INDEX_REFRESH_BLOCK)))
                     )
                 );
             }
-        }, clusterState -> isIndexBlockedForRefresh(request.shardId().getIndexName(), clusterState) == false);
+        }, clusterState -> isIndexBlockedForRefresh(projectMetadata, index, clusterState) == false);
     }
 
-    private static boolean isIndexBlockedForRefresh(String index, ClusterState state) {
-        return state.blocks().hasIndexBlock(index, INDEX_REFRESH_BLOCK);
+    private static boolean isIndexBlockedForRefresh(@Nullable ProjectMetadata projectMetadata, Index index, ClusterState state) {
+        if (projectMetadata == null) {
+            return false;
+        }
+        return state.blocks().hasIndexBlock(projectMetadata.id(), index.getName(), INDEX_REFRESH_BLOCK);
     }
 
     @Override

server/src/test/java/org/elasticsearch/action/admin/indices/refresh/TransportUnpromotableShardRefreshActionTests.java

@@ -19,7 +19,8 @@
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlocks;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
 import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
@@ -32,6 +33,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.tasks.Task;
@@ -161,11 +163,7 @@ protected void unpromotableShardOperation(
 
         var withRefreshBlock = randomBoolean();
         if (withRefreshBlock) {
-            setState(
-                clusterService,
-                ClusterState.builder(clusterService.state())
-                    .blocks(ClusterBlocks.builder().addIndexBlock(shardId.getIndexName(), IndexMetadata.INDEX_REFRESH_BLOCK))
-            );
+            setState(clusterService, clusterStateWithRefreshBlock(clusterService.state(), shardId, ProjectId.DEFAULT));
         }
 
         final var future = new PlainActionFuture<ActionResponse.Empty>();
@@ -196,7 +194,8 @@ protected void unpromotableShardOperation(
                 ClusterState.builder(clusterService.state())
                     .blocks(
                         ClusterBlocks.builder()
-                            .removeIndexBlock(Metadata.DEFAULT_PROJECT_ID, shardId.getIndexName(), IndexMetadata.INDEX_REFRESH_BLOCK)
+                            .blocks(clusterService.state().blocks())
+                            .removeIndexBlock(ProjectId.DEFAULT, shardId.getIndexName(), IndexMetadata.INDEX_REFRESH_BLOCK)
                     )
             );
         }
@@ -231,11 +230,7 @@ protected void unpromotableShardOperation(
             }
         };
 
-        setState(
-            clusterService,
-            ClusterState.builder(clusterService.state())
-                .blocks(ClusterBlocks.builder().addIndexBlock(shardId.getIndexName(), IndexMetadata.INDEX_REFRESH_BLOCK))
-        );
+        setState(clusterService, clusterStateWithRefreshBlock(clusterService.state(), shardId, ProjectId.DEFAULT));
 
         final var countDownLatch = new CountDownLatch(1);
         final var request = new UnpromotableShardRefreshRequest(
@@ -262,6 +257,18 @@ protected void unpromotableShardOperation(
         safeAwait(countDownLatch);
     }
 
+    private ClusterState clusterStateWithRefreshBlock(ClusterState base, ShardId shardId, ProjectId projectId) {
+        IndexMetadata indexMetadata = IndexMetadata.builder(shardId.getIndexName())
+            .settings(indexSettings(IndexVersion.current(), shardId.getIndex().getUUID(), 1, 0).build())
+            .build();
+        return ClusterState.builder(base)
+            .putProjectMetadata(ProjectMetadata.builder(projectId).put(indexMetadata, false))
+            .blocks(
+                ClusterBlocks.builder(base.blocks()).addIndexBlock(projectId, shardId.getIndexName(), IndexMetadata.INDEX_REFRESH_BLOCK)
+            )
+            .build();
+    }
+
     private IndexShardRoutingTable createShardRoutingTableWithPrimaryAndSearchShards(ShardId shardId, boolean withSearchShards) {
         final var shardRouting = TestShardRouting.newShardRouting(
             shardId,