Fixes identified from remote store IT run.

Signed-off-by: Swetha Guptha <[email protected]>
SwethaGuptha · Oct 25, 2024 · 4959722 · 4959722
1 parent 6c59037
commit 4959722
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/...ernalClusterTest/java/org/opensearch/gateway/remote/RemotePublicationConfigurationIT.java b/...ernalClusterTest/java/org/opensearch/gateway/remote/RemotePublicationConfigurationIT.java
@@ -112,7 +112,7 @@ public Settings.Builder remoteWithRoutingTableNodeSetting() {
                     segmentRepoPath,
                     REPOSITORY_2_NAME,
                     translogRepoPath,
-                    REPOSITORY_NAME,
+                    ROUTING_TABLE_REPO_NAME,
                     segmentRepoPath,
                     false
                 )

diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
@@ -555,8 +555,7 @@ private static void ensureRemoteStoreNodesCompatibility(DiscoveryNode joiningNod
             .filter(
                 node -> node.isRemoteStoreNode()
                     && RemoteStoreNodeAttribute.getRoutingTableRepoName(node.getAttributes()) != null
-                    && node.getAttributes().get(RemoteStoreNodeAttribute.REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY) != null
-                    && node.getAttributes().get(RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY) != null
+                    && RemoteStoreNodeAttribute.getSegmentRepoName(node.getAttributes()) != null
             )
             .findFirst();
         // If none of the existing nodes have routing table repo, then we skip this repo check if present in joining node.

diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
@@ -160,7 +160,6 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.repositories.IndexId;
 import org.opensearch.repositories.blobstore.BlobStoreRepository;
-import org.opensearch.repositories.fs.FsRepository;
 import org.opensearch.repositories.fs.ReloadableFsRepository;
 import org.opensearch.script.MockScriptService;
 import org.opensearch.search.MockSearchService;
@@ -228,12 +227,6 @@
 import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
 import static org.opensearch.index.remote.RemoteStoreEnums.PathHashAlgorithm.FNV_1A_COMPOSITE_1;
 import static org.opensearch.indices.IndicesService.CLUSTER_REPLICATION_TYPE_SETTING;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING;
@@ -2839,25 +2832,28 @@ public static Settings buildRemoteStoreNodeAttributes(
             ReloadableFsRepository.TYPE,
             remoteRoutingTableRepoName,
             remoteRoutingTableRepoPath,
-            FsRepository.TYPE,
+            ReloadableFsRepository.TYPE,
             withRateLimiterAttributes
         );
     }
 
     public static Settings buildRemoteStateNodeAttributes(String stateRepoName, Path stateRepoPath, String stateRepoType) {
+        String remotePublicationPrefix = "remote_publication";
         String stateRepoTypeAttributeKey = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            "node.attr." + REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            remotePublicationPrefix,
             stateRepoName
         );
         String stateRepoSettingsAttributeKeyPrefix = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            "node.attr." + REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            remotePublicationPrefix,
             stateRepoName
         );
         String prefixModeVerificationSuffix = BlobStoreRepository.PREFIX_MODE_VERIFICATION_SETTING.getKey();
         Settings.Builder settings = Settings.builder()
-            .put("node.attr." + REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY, stateRepoName)
+            .put("node.attr." + "remote_publication.state.repository", stateRepoName)
             .put(stateRepoTypeAttributeKey, stateRepoType)
             .put(stateRepoSettingsAttributeKeyPrefix + "location", stateRepoPath)
             .put(stateRepoSettingsAttributeKeyPrefix + prefixModeVerificationSuffix, prefixModeVerificationEnable);
@@ -2899,54 +2895,61 @@ private static Settings buildRemoteStoreNodeAttributes(
         String routingTableRepoType,
         boolean withRateLimiterAttributes
     ) {
+        String remotePublicationPrefix = "remote_publication";
         String segmentRepoTypeAttributeKey = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            "node.attr." + REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            remotePublicationPrefix,
             segmentRepoName
         );
         String segmentRepoSettingsAttributeKeyPrefix = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            "node.attr." + REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            remotePublicationPrefix,
             segmentRepoName
         );
         String translogRepoTypeAttributeKey = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            "node.attr." + REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+            remotePublicationPrefix,
             translogRepoName
         );
         String translogRepoSettingsAttributeKeyPrefix = String.format(
             Locale.getDefault(),
-            "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            "node.attr." + REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+            remotePublicationPrefix,
             translogRepoName
         );
         String routingTableRepoAttributeKey = null, routingTableRepoSettingsAttributeKeyPrefix = null;
         if (routingTableRepoName != null) {
             routingTableRepoAttributeKey = String.format(
                 Locale.getDefault(),
-                "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+                "node.attr." + REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
+                remotePublicationPrefix,
                 routingTableRepoName
             );
             routingTableRepoSettingsAttributeKeyPrefix = String.format(
                 Locale.getDefault(),
-                "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+                "node.attr." + REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
+                remotePublicationPrefix,
                 routingTableRepoName
             );
         }
 
         String prefixModeVerificationSuffix = BlobStoreRepository.PREFIX_MODE_VERIFICATION_SETTING.getKey();
 
         Settings.Builder settings = Settings.builder()
-            .put("node.attr." + REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY, segmentRepoName)
+            .put("node.attr." + "remote_publication.segment.repository", segmentRepoName)
             .put(segmentRepoTypeAttributeKey, segmentRepoType)
             .put(segmentRepoSettingsAttributeKeyPrefix + "location", segmentRepoPath)
             .put(segmentRepoSettingsAttributeKeyPrefix + prefixModeVerificationSuffix, prefixModeVerificationEnable)
-            .put("node.attr." + REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY, translogRepoName)
+            .put("node.attr." + "remote_publication.translog.repository", translogRepoName)
             .put(translogRepoTypeAttributeKey, translogRepoType)
             .put(translogRepoSettingsAttributeKeyPrefix + "location", translogRepoPath)
             .put(translogRepoSettingsAttributeKeyPrefix + prefixModeVerificationSuffix, prefixModeVerificationEnable)
             .put(buildRemoteStateNodeAttributes(segmentRepoName, segmentRepoPath, segmentRepoType));
         if (routingTableRepoName != null) {
-            settings.put("node.attr." + REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY, routingTableRepoName)
+            settings.put("node.attr." + "remote_publication.routing_table.repository", routingTableRepoName)
                 .put(routingTableRepoAttributeKey, routingTableRepoType)
                 .put(routingTableRepoSettingsAttributeKeyPrefix + "location", routingTableRepoPath);
         }