Adding check for atleast one remote node to mark as migration ongoing

Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
opensearch-project · Jun 3, 2024 · ea8de1f · ea8de1f
1 parent b470ddb
commit ea8de1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java
@@ -58,6 +58,7 @@
 
 import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableSet;
+import static org.opensearch.index.remote.RemoteStoreUtils.hasAtleastOneRemoteNode;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.isMigratingToRemoteStore;
 
 /**
@@ -142,7 +143,7 @@ public RoutingAllocation(
         this.clusterInfo = clusterInfo;
         this.shardSizeInfo = shardSizeInfo;
         this.currentNanoTime = currentNanoTime;
-        if (isMigratingToRemoteStore(metadata)) {
+        if (isMigratingToRemoteStore(metadata) && hasAtleastOneRemoteNode(nodes)) {
             indexMetadataUpdater.setOngoingRemoteStoreMigration(true);
             indexMetadataUpdater.setRepositoriesService(determineRepositoriesService(snapshotsInfoService));
         }

diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteStoreUtils.java b/server/src/main/java/org/opensearch/index/remote/RemoteStoreUtils.java
@@ -256,4 +256,10 @@ public static Map<String, String> getRemoteStoreRepoName(DiscoveryNodes discover
             .findFirst();
         return remoteNode.map(RemoteStoreNodeAttribute::getDataRepoNames).orElseGet(HashMap::new);
     }
+
+    public static boolean hasAtleastOneRemoteNode(DiscoveryNodes discoveryNodes) {
+        Map<String, DiscoveryNode> dataNodes = discoveryNodes.getDataNodes();
+        return dataNodes.isEmpty() == false
+            && dataNodes.keySet().stream().anyMatch(nodeId -> discoveryNodes.get(nodeId).isRemoteStoreNode());
+    }
 }