Enable remote routing by default with remote state

Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
shiv0408 · May 24, 2024 · 6d1990c · 6d1990c
1 parent a96304d
commit 6d1990c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableService.java b/server/src/main/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableService.java
@@ -73,7 +73,7 @@ public class RemoteRoutingTableService implements Closeable {
      */
     public static final Setting<Boolean> REMOTE_ROUTING_TABLE_ENABLED_SETTING = Setting.boolSetting(
         "cluster.remote_store.routing.enabled",
-        false,
+        true,
         Setting.Property.NodeScope,
         Setting.Property.Final
     );
@@ -276,7 +276,7 @@ public void close() throws IOException {
     public void start() {
         assert isRemoteRoutingTableEnabled(settings) == true : "Remote routing table is not enabled";
         final String remoteStoreRepo = settings.get(
-            Node.NODE_ATTRIBUTES.getKey() + RemoteStoreNodeAttribute.REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY
+            Node.NODE_ATTRIBUTES.getKey() + RemoteStoreNodeAttribute.REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY
         );
         assert remoteStoreRepo != null : "Remote routing table repository is not configured";
         final Repository repository = repositoriesService.get().repository(remoteStoreRepo);

diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -100,7 +100,7 @@ public class FeatureFlags {
 
     public static final Setting<Boolean> REMOTE_ROUTING_TABLE_EXPERIMENTAL_SETTING = Setting.boolSetting(
         REMOTE_ROUTING_TABLE_EXPERIMENTAL,
-        false,
+        true,
         Property.NodeScope
     );
 

diff --git a/server/src/main/java/org/opensearch/node/remotestore/RemoteStoreNodeAttribute.java b/server/src/main/java/org/opensearch/node/remotestore/RemoteStoreNodeAttribute.java
@@ -198,7 +198,7 @@ public static boolean isRemoteStoreClusterStateEnabled(Settings settings) {
     }
 
     public static boolean isRemoteRoutingTableAttributePresent(Settings settings) {
-        return settings.getByPrefix(Node.NODE_ATTRIBUTES.getKey() + REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY)
+        return settings.getByPrefix(Node.NODE_ATTRIBUTES.getKey() + REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY)
             .isEmpty() == false;
     }