Fix shards condition in TransportRemoteStoreStatsAction

Signed-off-by: Ashish Singh <ssashish@amazon.com>
opensearch-project · May 24, 2023 · 02079a8 · 02079a8
1 parent 8e2d059
commit 02079a8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...rg/opensearch/action/admin/cluster/remotestore/stats/TransportRemoteStoreStatsAction.java b/...rg/opensearch/action/admin/cluster/remotestore/stats/TransportRemoteStoreStatsAction.java
@@ -14,6 +14,7 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockException;
 import org.opensearch.cluster.block.ClusterBlockLevel;
+import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.routing.PlainShardsIterator;
 import org.opensearch.cluster.routing.ShardRouting;
@@ -89,14 +90,17 @@ protected ShardsIterator shards(ClusterState clusterState, RemoteStoreStatsReque
         }
         return new PlainShardsIterator(
             newShardRoutings.stream()
-                .filter(shardRouting -> remoteRefreshSegmentPressureService.getRemoteRefreshSegmentTracker(shardRouting.shardId()) != null)
                 .filter(
                     shardRouting -> !request.local()
                         || (shardRouting.currentNodeId() == null
                             || shardRouting.currentNodeId().equals(clusterState.getNodes().getLocalNodeId()))
                 )
                 .filter(ShardRouting::primary)
-                .filter(shardRouting -> indicesService.indexService(shardRouting.index()).getIndexSettings().isRemoteStoreEnabled())
+                .filter(
+                    shardRouting -> Boolean.parseBoolean(
+                        clusterState.getMetadata().index(shardRouting.index()).getSettings().get(IndexMetadata.SETTING_REMOTE_STORE_ENABLED)
+                    )
+                )
                 .collect(Collectors.toList())
         );
     }