Address review comments

Signed-off-by: Anshu Agarwal <anshukag@amazon.com>
opensearch-project · Jan 31, 2023 · 122a098 · 122a098
1 parent 8806fc8
commit 122a098
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/FailAwareWeightedRouting.java b/server/src/main/java/org/opensearch/cluster/routing/FailAwareWeightedRouting.java
@@ -46,8 +46,6 @@ public static FailAwareWeightedRouting getInstance() {
         return INSTANCE;
     }
 
-    public static WeightedRoutingStats weightedRoutingStats = new WeightedRoutingStats();
-
     /**
      * *
      * @return true if exception is due to cluster availability issues
@@ -105,7 +103,7 @@ public SearchShardTarget findNext(final SearchShardIterator shardIt, ClusterStat
             SearchShardTarget nextShard = next;
             if (canFailOpen(nextShard.getShardId(), exception, clusterState)) {
                 logger.info(() -> new ParameterizedMessage("{}: Fail open executed due to exception", nextShard.getShardId()), exception);
-                weightedRoutingStats.updateFailOpenCount();
+                getWeightedRoutingStats().updateFailOpenCount();
                 break;
             }
             next = shardIt.nextOrNull();
@@ -128,7 +126,7 @@ public ShardRouting findNext(final ShardsIterator shardsIt, ClusterState cluster
             ShardRouting nextShard = next;
             if (canFailOpen(nextShard.shardId(), exception, clusterState)) {
                 logger.info(() -> new ParameterizedMessage("{}: Fail open executed due to exception", nextShard.shardId()), exception);
-                weightedRoutingStats.updateFailOpenCount();
+                getWeightedRoutingStats().updateFailOpenCount();
                 break;
             }
             next = shardsIt.nextOrNull();
@@ -155,7 +153,7 @@ private boolean hasInActiveShardCopies(ClusterState clusterState, ShardId shardI
         return false;
     }
 
-    public WeightedRoutingStats getStats() {
-        return weightedRoutingStats;
+    public WeightedRoutingStats getWeightedRoutingStats() {
+        return WeightedRoutingStats.getInstance();
     }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/routing/WeightedRoutingStats.java b/server/src/main/java/org/opensearch/cluster/routing/WeightedRoutingStats.java
@@ -28,7 +28,13 @@ public class WeightedRoutingStats implements ToXContentFragment, Writeable {
     // number of times fail open has to be executed for search requests
     private AtomicInteger failOpenCount;
 
-    public WeightedRoutingStats() {
+    private static final WeightedRoutingStats INSTANCE = new WeightedRoutingStats();
+
+    public static WeightedRoutingStats getInstance() {
+        return INSTANCE;
+    }
+
+    private WeightedRoutingStats() {
         failOpenCount = new AtomicInteger(0);
     }
 

diff --git a/server/src/main/java/org/opensearch/node/NodeService.java b/server/src/main/java/org/opensearch/node/NodeService.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.node;
 
-import org.opensearch.cluster.routing.FailAwareWeightedRouting;
+import org.opensearch.cluster.routing.WeightedRoutingStats;
 import org.opensearch.core.internal.io.IOUtils;
 import org.opensearch.Build;
 import org.opensearch.Version;
@@ -204,7 +204,7 @@ public NodeStats stats(
             shardIndexingPressure ? this.indexingPressureService.shardStats(indices) : null,
             searchBackpressure ? this.searchBackpressureService.nodeStats() : null,
             clusterManagerThrottling ? this.clusterService.getClusterManagerService().getThrottlingStats() : null,
-            weightedRoutingStats ? FailAwareWeightedRouting.getInstance().getStats() : null
+            weightedRoutingStats ? WeightedRoutingStats.getInstance() : null
         );
     }
 

diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java
@@ -723,7 +723,7 @@ public static NodeStats createNodeStats() {
         ScriptCacheStats scriptCacheStats = scriptStats != null ? scriptStats.toScriptCacheStats() : null;
 
         WeightedRoutingStats weightedRoutingStats = null;
-        weightedRoutingStats = new WeightedRoutingStats();
+        weightedRoutingStats = WeightedRoutingStats.getInstance();
         weightedRoutingStats.updateFailOpenCount();
 
         // TODO NodeIndicesStats are not tested here, way too complicated to create, also they need to be migrated to Writeable yet