Defer nodeSettings to clusterSettings change

Signed-off-by: Lakshya Taragi <[email protected]>
opensearch-project · Apr 11, 2024 · b1c049e · b1c049e
1 parent 3bf5eb5
commit b1c049e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/...lClusterTest/java/org/opensearch/remotestore/CreateRemoteIndexClusterDefaultDocRepIT.java b/...lClusterTest/java/org/opensearch/remotestore/CreateRemoteIndexClusterDefaultDocRepIT.java
@@ -36,6 +36,7 @@ protected Settings nodeSettings(int nodeOriginal) {
         return builder.build();
     }
 
+    @Override
     public void testDefaultRemoteStoreNoUserOverride() throws Exception {
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)

diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/CreateRemoteIndexIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/CreateRemoteIndexIT.java
@@ -8,9 +8,12 @@
 
 package org.opensearch.remotestore;
 
+import org.opensearch.action.admin.indices.get.GetIndexRequest;
+import org.opensearch.action.admin.indices.get.GetIndexResponse;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.index.IndexSettings;
 import org.opensearch.indices.replication.common.ReplicationType;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.junit.Before;
@@ -22,6 +25,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
 import static org.opensearch.index.IndexSettings.INDEX_REMOTE_TRANSLOG_BUFFER_INTERVAL_SETTING;
+import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.containsString;
 
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
@@ -32,6 +36,27 @@ public void setup() throws Exception {
         internalCluster().startNodes(2);
     }
 
+    public void testDefaultRemoteStoreNoUserOverride() throws Exception {
+        Settings settings = Settings.builder()
+            .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+            .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+            .build();
+        assertAcked(client().admin().indices().prepareCreate("test-idx-1").setSettings(settings).get());
+        GetIndexResponse getIndexResponse = client().admin()
+            .indices()
+            .getIndex(new GetIndexRequest().indices("test-idx-1").includeDefaults(true))
+            .get();
+        Settings indexSettings = getIndexResponse.settings().get("test-idx-1");
+        verifyRemoteStoreIndexSettings(
+            indexSettings,
+            "true",
+            REPOSITORY_NAME,
+            REPOSITORY_2_NAME,
+            ReplicationType.SEGMENT.toString(),
+            IndexSettings.DEFAULT_REMOTE_TRANSLOG_BUFFER_INTERVAL
+        );
+    }
+
     public void testRemoteStoreDisabledByUser() throws Exception {
         Settings settings = Settings.builder()
             .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -1016,8 +1016,8 @@ public static void updateReplicationStrategy(
             indexReplicationType = INDEX_REPLICATION_TYPE_SETTING.get(requestSettings);
         } else if (combinedTemplateSettings != null && INDEX_REPLICATION_TYPE_SETTING.exists(combinedTemplateSettings)) {
             indexReplicationType = INDEX_REPLICATION_TYPE_SETTING.get(combinedTemplateSettings);
-        } else if (clusterSettings.get(CLUSTER_REPLICATION_TYPE_SETTING) != null) {
-            indexReplicationType = clusterSettings.get(CLUSTER_REPLICATION_TYPE_SETTING);
+        } else if (CLUSTER_REPLICATION_TYPE_SETTING.exists(nodeSettings)) {
+            indexReplicationType = CLUSTER_REPLICATION_TYPE_SETTING.get(nodeSettings);
         } else if (isRemoteDataAttributePresent(nodeSettings)) {
             indexReplicationType = ReplicationType.SEGMENT;
         } else {

diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -1400,10 +1400,6 @@ public void testRemoteStoreImplicitOverrideReplicationTypeToSegmentForRemoteStor
             .put(segmentRepositoryNameAttributeKey, SEGMENT_REPO)
             .put(translogRepositoryNameAttributeKey, TRANSLOG_REPO)
             .build();
-        clusterSettings = new ClusterSettings(
-            Settings.builder().put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT).build(),
-            ClusterSettings.BUILT_IN_CLUSTER_SETTINGS
-        );
         request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
         final Settings.Builder requestSettings = Settings.builder();
         request.settings(requestSettings.build());
@@ -1437,10 +1433,6 @@ public void testRemoteStoreNoUserOverrideIndexSettings() {
             .put(segmentRepositoryNameAttributeKey, SEGMENT_REPO)
             .put(translogRepositoryNameAttributeKey, TRANSLOG_REPO)
             .build();
-        clusterSettings = new ClusterSettings(
-            Settings.builder().put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT).build(),
-            ClusterSettings.BUILT_IN_CLUSTER_SETTINGS
-        );
         request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
         Settings indexSettings = aggregateIndexSettings(
             clusterState,
@@ -1936,7 +1928,6 @@ public void testDeprecatedSimpleFSStoreSettings() {
 
     public void testClusterReplicationSetting() {
         Settings settings = Settings.builder().put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT).build();
-        clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
         request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
         Settings indexSettings = aggregateIndexSettings(
             ClusterState.EMPTY_STATE,