Resolve comments

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

Author: Gagan Singh Saini

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

@@ -89,8 +89,7 @@ public class DiskThresholdMonitor {
     private final Supplier<Double> dataToFileCacheSizeRatioSupplier;
     private final LongSupplier currentTimeMillisSupplier;
     private final RerouteService rerouteService;
-    private final HotNodeDiskThresholdEvaluator hotNodeEvaluator;
-    private final WarmNodeDiskThresholdEvaluator warmNodeEvaluator;
+    private final NodeDiskEvaluator nodeDiskEvaluator;
     private final AtomicLong lastRunTimeMillis = new AtomicLong(Long.MIN_VALUE);
     private final AtomicBoolean checkInProgress = new AtomicBoolean();
 
@@ -126,8 +125,12 @@ public DiskThresholdMonitor(
         this.rerouteService = rerouteService;
         this.diskThresholdSettings = new DiskThresholdSettings(settings, clusterSettings);
         this.client = client;
-        this.hotNodeEvaluator = new HotNodeDiskThresholdEvaluator(diskThresholdSettings);
-        this.warmNodeEvaluator = new WarmNodeDiskThresholdEvaluator(diskThresholdSettings, dataToFileCacheSizeRatioSupplier);
+        DiskThresholdEvaluator hotNodeEvaluator = new HotNodeDiskThresholdEvaluator(diskThresholdSettings);
+        DiskThresholdEvaluator warmNodeEvaluator = new WarmNodeDiskThresholdEvaluator(
+            diskThresholdSettings,
+            dataToFileCacheSizeRatioSupplier
+        );
+        this.nodeDiskEvaluator = new NodeDiskEvaluator(hotNodeEvaluator, warmNodeEvaluator);
         this.dataToFileCacheSizeRatioSupplier = dataToFileCacheSizeRatioSupplier;
     }
 
@@ -187,7 +190,7 @@ public void onNewInfo(ClusterInfo info) {
                 usage = getWarmDiskUsage(usage, info, routingNode, state);
             }
 
-            if (isNodeExceedingFloodStageWatermark(usage, isWarmNode)) {
+            if (nodeDiskEvaluator.isNodeExceedingFloodStageWatermark(usage, isWarmNode)) {
 
                 nodesOverLowThreshold.add(node);
                 nodesOverHighThreshold.add(node);
@@ -210,7 +213,7 @@ public void onNewInfo(ClusterInfo info) {
                 continue;
             }
 
-            if (isNodeExceedingHighWatermark(usage, isWarmNode)) {
+            if (nodeDiskEvaluator.isNodeExceedingHighWatermark(usage, isWarmNode)) {
 
                 if (routingNode != null) { // might be temporarily null if the ClusterInfoService and the ClusterService are out of step
                     for (ShardRouting routing : routingNode) {
@@ -229,7 +232,7 @@ public void onNewInfo(ClusterInfo info) {
                 Math.max(0L, usage.getFreeBytes() - reservedSpace)
             );
 
-            if (isNodeExceedingHighWatermark(usageWithReservedSpace, isWarmNode)) {
+            if (nodeDiskEvaluator.isNodeExceedingHighWatermark(usageWithReservedSpace, isWarmNode)) {
 
                 nodesOverLowThreshold.add(node);
                 nodesOverHighThreshold.add(node);
@@ -247,7 +250,7 @@ public void onNewInfo(ClusterInfo info) {
                     );
                 }
 
-            } else if (isNodeExceedingLowWatermark(usage, isWarmNode)) {
+            } else if (nodeDiskEvaluator.isNodeExceedingLowWatermark(usage, isWarmNode)) {
 
                 nodesOverHighThresholdAndRelocating.remove(node);
 
@@ -328,7 +331,7 @@ public void onNewInfo(ClusterInfo info) {
                     }
 
                     boolean isNodeWarm = REMOTE_CAPABLE.equals(getNodePool(routingNode));
-                    if (isNodeExceedingHighWatermark(usageIncludingRelocations, isNodeWarm)) {
+                    if (nodeDiskEvaluator.isNodeExceedingHighWatermark(usageIncludingRelocations, isNodeWarm)) {
 
                         nodesOverHighThresholdAndRelocating.remove(diskUsage.getNodeId());
                         logger.warn(
@@ -431,21 +434,6 @@ long sizeOfRelocatingShards(RoutingNode routingNode, DiskUsage diskUsage, Cluste
         );
     }
 
-    private boolean isNodeExceedingFloodStageWatermark(DiskUsage diskUsage, boolean isWarmNode) {
-        DiskThresholdEvaluator evaluator = isWarmNode ? warmNodeEvaluator : hotNodeEvaluator;
-        return evaluator.isNodeExceedingFloodStageWatermark(diskUsage);
-    }
-
-    private boolean isNodeExceedingHighWatermark(DiskUsage diskUsage, boolean isWarmNode) {
-        DiskThresholdEvaluator evaluator = isWarmNode ? warmNodeEvaluator : hotNodeEvaluator;
-        return evaluator.isNodeExceedingHighWatermark(diskUsage);
-    }
-
-    private boolean isNodeExceedingLowWatermark(DiskUsage diskUsage, boolean isWarmNode) {
-        DiskThresholdEvaluator evaluator = isWarmNode ? warmNodeEvaluator : hotNodeEvaluator;
-        return evaluator.isNodeExceedingLowWatermark(diskUsage);
-    }
-
     private DiskUsage getWarmDiskUsage(DiskUsage diskUsage, ClusterInfo info, RoutingNode node, ClusterState state) {
         double dataToFileCacheSizeRatio = dataToFileCacheSizeRatioSupplier.get();
         AggregateFileCacheStats fileCacheStats = info.getNodeFileCacheStats().getOrDefault(diskUsage.getNodeId(), null);

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

@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.cluster.routing.allocation;
+
+import org.opensearch.cluster.DiskUsage;
+
+public class NodeDiskEvaluator {
+
+    private final DiskThresholdEvaluator hotNodeEvaluator;
+    private final DiskThresholdEvaluator warmNodeEvaluator;
+
+    public NodeDiskEvaluator(DiskThresholdEvaluator hotEvaluator, DiskThresholdEvaluator warmEvaluator) {
+        this.hotNodeEvaluator = hotEvaluator;
+        this.warmNodeEvaluator = warmEvaluator;
+    }
+
+    public boolean isNodeExceedingFloodStageWatermark(DiskUsage diskUsage, boolean isWarmNode) {
+        return isWarmNode
+            ? warmNodeEvaluator.isNodeExceedingFloodStageWatermark(diskUsage)
+            : hotNodeEvaluator.isNodeExceedingFloodStageWatermark(diskUsage);
+    }
+
+    public boolean isNodeExceedingHighWatermark(DiskUsage diskUsage, boolean isWarmNode) {
+        return isWarmNode
+            ? warmNodeEvaluator.isNodeExceedingHighWatermark(diskUsage)
+            : hotNodeEvaluator.isNodeExceedingHighWatermark(diskUsage);
+    }
+
+    public boolean isNodeExceedingLowWatermark(DiskUsage diskUsage, boolean isWarmNode) {
+        return isWarmNode
+            ? warmNodeEvaluator.isNodeExceedingLowWatermark(diskUsage)
+            : hotNodeEvaluator.isNodeExceedingLowWatermark(diskUsage);
+    }
+}