Adding number of routing shards to index settings before passing into…

… GetSettingsResponse

Signed-off-by: Sophia <[email protected]>

CHANGELOG.md

@@ -45,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix fs info reporting negative available size ([#11573](https:/opensearch-project/OpenSearch/pull/11573))
 - Add ListPitInfo::getKeepAlive() getter ([#14495](https:/opensearch-project/OpenSearch/pull/14495))
 - Fix FuzzyQuery in keyword field will use IndexOrDocValuesQuery when both of index and doc_value are true ([#14378](https:/opensearch-project/OpenSearch/pull/14378))
+- Updated GET {index}/_settings to return `number_of_routing_shards` ([#14446](https:/opensearch-project/OpenSearch/pull/14446))
 
 ### Security
 

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/40_with_number_of_sharding_routes.yml

@@ -0,0 +1,39 @@
+---
+setup:
+ - do:
+ indices.create:
+ index: test_1
+ body:
+ settings:
+ number_of_shards: 3
+ number_of_replicas: 0
+ number_of_routing_shards: 6
+
+---
+"Test number of routing shards returned":
+ - skip:
+ version: " - 2.99.99"
+ reason: "introduced in 3.0.0"
+ - do:
+ indices.get_settings: {}
+
+ - match: { test_1.settings.index.number_of_shards: "3"}
+ - match: { test_1.settings.index.number_of_replicas: "0"}
+ - match: { test_1.settings.index.number_of_routing_shards: "6"}
+
+ - do:
+ indices.get_settings:
+ index: test_1
+
+ - match: { test_1.settings.index.number_of_shards: "3"}
+ - match: { test_1.settings.index.number_of_replicas: "0"}
+ - match: { test_1.settings.index.number_of_routing_shards: "6"}
+
+ - do:
+ indices.get_settings:
+ index: test_1
+ name: _all
+
+ - match: { test_1.settings.index.number_of_shards: "3"}
+ - match: { test_1.settings.index.number_of_replicas: "0"}
+ - match: { test_1.settings.index.number_of_routing_shards: "6"}

server/src/main/java/org/opensearch/action/admin/indices/settings/get/TransportGetSettingsAction.java

@@ -121,7 +121,12 @@ protected void clusterManagerOperation(GetSettingsRequest request, ClusterState
  continue;
  }
 
- Settings indexSettings = settingsFilter.filter(indexMetadata.getSettings());
+ Settings indexSettingsWithRoutingShards = Settings.builder()
+ .put(indexMetadata.getSettings())
+ .put(IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.getKey(), indexMetadata.getRoutingNumShards())
+ .build();
+
+ Settings indexSettings = settingsFilter.filter(indexSettingsWithRoutingShards);
  if (request.humanReadable()) {
  indexSettings = IndexMetadata.addHumanReadableSettings(indexSettings);
  }

server/src/test/java/org/opensearch/action/admin/indices/settings/get/GetSettingsActionTests.java

@@ -165,6 +165,16 @@ public void testIncludeDefaultsWithFiltering() {
  }, exception -> { throw new AssertionError(exception); }));
  }
 
+ public void testShouldReturnNumberOfRoutingShards() {
+ GetSettingsRequest noDefaultsRequest = new GetSettingsRequest().indices(indexName);
+ getSettingsAction.execute(null, noDefaultsRequest, ActionListener.wrap(noDefaultsResponse -> {
+ assertNotNull(
+ "index.number_of_routing_shards should be set",
+ noDefaultsResponse.getSetting(indexName, "index.number_of_routing_shards")
+ );
+ }, exception -> { throw new AssertionError(exception); }));
+ }
+
  static class Resolver extends IndexNameExpressionResolver {
  Resolver() {
  super(new ThreadContext(Settings.EMPTY));