Resolving Comments

Signed-off-by: Gagan Singh Saini <[email protected]>

Author: Gagan Singh Saini

server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettings.java

@@ -60,6 +60,12 @@ public class DiskThresholdSettings {
         Setting.Property.Dynamic,
         Setting.Property.NodeScope
     );
+    public static final Setting<Boolean> CLUSTER_ROUTING_ALLOCATION_WARM_DISK_THRESHOLD_ENABLED_SETTING = Setting.boolSetting(
+        "cluster.routing.allocation.disk.warm_threshold_enabled",
+        true,
+        Setting.Property.Dynamic,
+        Setting.Property.NodeScope
+    );
     public static final Setting<Boolean> ENABLE_FOR_SINGLE_DATA_NODE = Setting.boolSetting(
         "cluster.routing.allocation.disk.watermark.enable_for_single_data_node",
         false,
@@ -118,6 +124,7 @@ public class DiskThresholdSettings {
     private volatile boolean includeRelocations;
     private volatile boolean createIndexBlockAutoReleaseEnabled;
     private volatile boolean enabled;
+    private volatile boolean warmThresholdEnabled;
     private volatile TimeValue rerouteInterval;
     private volatile Double freeDiskThresholdFloodStage;
     private volatile ByteSizeValue freeBytesThresholdFloodStage;
@@ -144,13 +151,15 @@ public DiskThresholdSettings(Settings settings, ClusterSettings clusterSettings)
         this.includeRelocations = CLUSTER_ROUTING_ALLOCATION_INCLUDE_RELOCATIONS_SETTING.get(settings);
         this.rerouteInterval = CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.get(settings);
         this.enabled = CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.get(settings);
+        this.warmThresholdEnabled = CLUSTER_ROUTING_ALLOCATION_WARM_DISK_THRESHOLD_ENABLED_SETTING.get(settings);
         this.createIndexBlockAutoReleaseEnabled = CLUSTER_CREATE_INDEX_BLOCK_AUTO_RELEASE.get(settings);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING, this::setLowWatermark);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING, this::setHighWatermark);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING, this::setFloodStage);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_INCLUDE_RELOCATIONS_SETTING, this::setIncludeRelocations);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING, this::setRerouteInterval);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING, this::setEnabled);
+        clusterSettings.addSettingsUpdateConsumer(CLUSTER_ROUTING_ALLOCATION_WARM_DISK_THRESHOLD_ENABLED_SETTING, this::setWarmThresholdEnabled);
         clusterSettings.addSettingsUpdateConsumer(CLUSTER_CREATE_INDEX_BLOCK_AUTO_RELEASE, this::setCreateIndexBlockAutoReleaseEnabled);
     }
 
@@ -316,6 +325,10 @@ private void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
+    private void setWarmThresholdEnabled(boolean enabled) {
+        this.warmThresholdEnabled = enabled;
+    }
+
     private void setLowWatermark(String lowWatermark) {
         // Watermark is expressed in terms of used data, but we need "free" data watermark
         this.lowWatermarkRaw = lowWatermark;
@@ -395,6 +408,10 @@ public boolean isEnabled() {
         return enabled;
     }
 
+    public boolean isWarmThresholdEnabled() {
+        return warmThresholdEnabled;
+    }
+
     public TimeValue getRerouteInterval() {
         return rerouteInterval;
     }

server/src/main/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDecider.java

@@ -169,7 +169,7 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
 
         // For this case WarmDiskThresholdDecider Decider will take decision
         if (REMOTE_CAPABLE.equals(getNodePool(node)) && REMOTE_CAPABLE.equals(getShardPool(shardRouting, allocation))) {
-            return super.canAllocate(shardRouting, node, allocation);
+            return Decision.ALWAYS;
         } else if (REMOTE_CAPABLE.equals(getShardPool(shardRouting, allocation))) {
             return Decision.NO;
         }
@@ -439,7 +439,7 @@ public Decision canRemain(ShardRouting shardRouting, RoutingNode node, RoutingAl
 
         // For this case WarmDiskThresholdDecider Decider will take decision
         if (REMOTE_CAPABLE.equals(getNodePool(node)) && REMOTE_CAPABLE.equals(getShardPool(shardRouting, allocation))) {
-            return super.canAllocate(shardRouting, node, allocation);
+            return Decision.ALWAYS;
         } else if (REMOTE_CAPABLE.equals(getShardPool(shardRouting, allocation))) {
             return Decision.NO;
         }

server/src/main/java/org/opensearch/cluster/routing/allocation/decider/WarmDiskThresholdDecider.java

@@ -287,8 +287,8 @@ private long calculateTotalAddressableRemoteSize(RoutingNode node, RoutingAlloca
 
     private Decision earlyTerminate(RoutingNode node, RoutingAllocation allocation) {
         // Always allow allocation if the decider is disabled
-        if (diskThresholdSettings.isEnabled() == false) {
-            return allocation.decision(Decision.YES, NAME, "the disk threshold decider is disabled");
+        if (diskThresholdSettings.isWarmThresholdEnabled() == false) {
+            return allocation.decision(Decision.YES, NAME, "the warm disk threshold decider is disabled");
         }
 
         // Allow allocation regardless if only a single data node is available
@@ -316,6 +316,12 @@ private Decision earlyTerminate(RoutingNode node, RoutingAllocation allocation)
             }
             return allocation.decision(Decision.YES, NAME, "File Cache Stat is unavailable");
         }
+
+        double remoteDataRatio = fileCacheSettings.getRemoteDataRatio();
+        if (remoteDataRatio == 0) {
+            return allocation.decision(Decision.YES, NAME, "Remote data ratio is set to 0, no limit on allocation");
+        }
+
         return null;
     }