Fix index create block getting applied when there is no data nodes he…

…althy (#6756) (#6771) (cherry picked from commit e6a3700) Signed-off-by: Rishav Sagar <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Mar 21, 2023 · 7ea7792 · 7ea7792
1 parent 937e859
commit 7ea7792
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java
@@ -403,6 +403,7 @@ public void onNewInfo(ClusterInfo info) {
 
         // If all the nodes are breaching high disk watermark, we apply index create block to avoid red clusters.
         if ((state.getBlocks().hasGlobalBlockWithId(Metadata.CLUSTER_CREATE_INDEX_BLOCK.id()) == false)
+            && nodes.size() > 0
             && nodesOverHighThreshold.size() == nodes.size()) {
             setIndexCreateBlock(listener, true);
         } else if (state.getBlocks().hasGlobalBlockWithId(Metadata.CLUSTER_CREATE_INDEX_BLOCK.id())

diff --git a/...er/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitorTests.java b/...er/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitorTests.java
@@ -61,6 +61,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.LongSupplier;
@@ -681,6 +682,56 @@ protected void setIndexCreateBlock(ActionListener<Void> listener, boolean indexC
         );
     }
 
+    public void testIndexCreateBlockWhenNoDataNodeHealthy() {
+        AllocationService allocation = createAllocationService(
+            Settings.builder().put("cluster.routing.allocation.node_concurrent_recoveries", 10).build()
+        );
+        Metadata metadata = Metadata.builder().build();
+        RoutingTable routingTable = RoutingTable.builder().build();
+        final ClusterState clusterState = applyStartedShardsUntilNoChange(
+            ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
+                .metadata(metadata)
+                .routingTable(routingTable)
+                .build(),
+            allocation
+        );
+        AtomicInteger countBlocksCalled = new AtomicInteger();
+        AtomicBoolean reroute = new AtomicBoolean(false);
+        AtomicReference<Set<String>> indices = new AtomicReference<>();
+        AtomicLong currentTime = new AtomicLong();
+        Settings settings = Settings.builder().build();
+        DiskThresholdMonitor monitor = new DiskThresholdMonitor(
+            settings,
+            () -> clusterState,
+            new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
+            null,
+            currentTime::get,
+            (reason, priority, listener) -> {
+                assertTrue(reroute.compareAndSet(false, true));
+                assertThat(priority, equalTo(Priority.HIGH));
+                listener.onResponse(null);
+            }
+        ) {
+
+            @Override
+            protected void updateIndicesReadOnly(Set<String> indicesToMarkReadOnly, ActionListener<Void> listener, boolean readOnly) {
+                assertTrue(indices.compareAndSet(null, indicesToMarkReadOnly));
+                assertFalse(readOnly);
+                listener.onResponse(null);
+            }
+
+            @Override
+            protected void setIndexCreateBlock(ActionListener<Void> listener, boolean indexCreateBlock) {
+                countBlocksCalled.set(countBlocksCalled.get() + 1);
+                listener.onResponse(null);
+            }
+        };
+
+        ImmutableOpenMap.Builder<String, DiskUsage> builder = ImmutableOpenMap.builder();
+        monitor.onNewInfo(clusterInfo(builder.build()));
+        assertTrue(countBlocksCalled.get() == 0);
+    }
+
     private void assertNoLogging(DiskThresholdMonitor monitor, ImmutableOpenMap<String, DiskUsage> diskUsages)
         throws IllegalAccessException {
         try (MockLogAppender mockAppender = MockLogAppender.createForLoggers(LogManager.getLogger(DiskThresholdMonitor.class))) {