Fixing breaking changes

Signed-off-by: Gagan Singh Saini <gagasa@amazon.com>

Author: Gagan Singh Saini

CHANGELOG.md

@@ -43,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Search Stats] Add search & star-tree search query failure count metrics ([#19210](https://github.com/opensearch-project/OpenSearch/issues/19210))
 - [Star-tree] Support for multi-terms aggregation ([#18398](https://github.com/opensearch-project/OpenSearch/issues/18398))
 - Add stream search enabled cluster setting and auto fallback logic ([#19506](https://github.com/opensearch-project/OpenSearch/pull/19506))
+- Add seperate shard limit validation for local and remote indices ([#19532](https://github.com/opensearch-project/OpenSearch/pull/19532))
 - Implement GRPC Exists, Regexp, and Wildcard queries ([#19392](https://github.com/opensearch-project/OpenSearch/pull/19392))
 - Implement GRPC GeoBoundingBox, GeoDistance queries ([#19451](https://github.com/opensearch-project/OpenSearch/pull/19451))
 - Implement GRPC Ids, Range, and Terms Set queries ([#19448](https://github.com/opensearch-project/OpenSearch/pull/19448))

server/src/main/java/org/opensearch/cluster/metadata/Metadata.java

@@ -912,7 +912,7 @@ public int getTotalNumberOfShards() {
      * replicas, but does not include shards that are part of closed indices.
      * @return The total number of open shards from all indices.
      */
-    public int getTotalOpenLocalOnlyIndexShards() {
+    public int getTotalOpenIndexShards() {
         return this.totalOpenLocalOnlyIndexShards;
     }
 

server/src/main/java/org/opensearch/indices/ShardLimitValidator.java

@@ -340,7 +340,7 @@ public Optional<String> checkShardLimit(int newShards, ClusterState state, Routi
             )
             : checkShardLimit(
                 newShards,
-                state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+                state.getMetadata().getTotalOpenIndexShards(),
                 getShardLimitPerNode(),
                 getShardLimitPerCluster(),
                 state.getNodes().getDataNodes().size(),

server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java

@@ -79,7 +79,7 @@ public void testOverShardLimit() {
         int shardsToAdd = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas());
         Optional<String> errorMessage = ShardLimitValidator.checkShardLimit(
             shardsToAdd,
-            state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+            state.getMetadata().getTotalOpenIndexShards(),
             counts.getShardsPerNode(),
             -1,
             state.getNodes().getDataNodes().size(),
@@ -111,7 +111,7 @@ public void testOverShardLimitWithMaxShardCountLimit() {
         int maxShardLimitOnCluster = shardsToAdd - 1;
         Optional<String> errorMessage = ShardLimitValidator.checkShardLimit(
             shardsToAdd,
-            state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+            state.getMetadata().getTotalOpenIndexShards(),
             counts.getShardsPerNode(),
             maxShardLimitOnCluster,
             state.getNodes().getDataNodes().size(),
@@ -147,7 +147,7 @@ public void testUnderShardLimit() {
         int shardsToAdd = randomIntBetween(1, (counts.getShardsPerNode() * nodesInCluster) - existingShards);
         Optional<String> errorMessage = ShardLimitValidator.checkShardLimit(
             shardsToAdd,
-            state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+            state.getMetadata().getTotalOpenIndexShards(),
             counts.getShardsPerNode(),
             -1,
             state.getNodes().getDataNodes().size(),
@@ -235,7 +235,7 @@ public void testComputedMaxShardsOfClusterIntOverFlow() {
         ClusterState state = createClusterForShardLimitTest(15, 1, 1);
         Optional<String> errorMessage = ShardLimitValidator.checkShardLimit(
             2,
-            state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+            state.getMetadata().getTotalOpenIndexShards(),
             maxShardLimitPerNode,
             -1,
             state.getNodes().getDataNodes().size(),
@@ -245,7 +245,7 @@ public void testComputedMaxShardsOfClusterIntOverFlow() {
 
         errorMessage = ShardLimitValidator.checkShardLimit(
             Integer.MAX_VALUE - 1,
-            state.getMetadata().getTotalOpenLocalOnlyIndexShards(),
+            state.getMetadata().getTotalOpenIndexShards(),
             maxShardLimitPerNode,
             -1,
             state.getNodes().getDataNodes().size(),