diff --git a/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java index 522d47009ec29..3b4fdf2c9c3fc 100644 --- a/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java +++ b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java @@ -165,6 +165,10 @@ public boolean hasGlobalBlock(ClusterBlock block) { return global.contains(block); } + public boolean hasGlobalBlock(ProjectId projectId, ClusterBlock block) { + return global(projectId).contains(block); + } + public boolean hasGlobalBlockWithId(final int blockId) { for (ClusterBlock clusterBlock : global) { if (clusterBlock.id() == blockId) { diff --git a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java index 6d398d4677f25..a5e0edd54c9fc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java @@ -191,6 +191,7 @@ public void testProjectGlobal() { assertThat(clusterBlocks.global(project1).size(), equalTo(2)); assertThat(clusterBlocks.global(project2).size(), equalTo(1)); assertTrue(clusterBlocks.indexBlocked(project1, randomFrom(projectGlobalBlock.levels()), project1Index)); + assertTrue(clusterBlocks.hasGlobalBlock(project1, projectGlobalBlock)); } private static ClusterBlock randomClusterBlock(TransportVersion version) {