Add fix to allow mixed mode join task

Signed-off-by: Lakshya Taragi <[email protected]>
ltaragi · Mar 1, 2024 · bfa399c · bfa399c
1 parent a53f53e
commit bfa399c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
@@ -83,6 +83,8 @@ public class JoinTaskExecutor implements ClusterStateTaskExecutor<JoinTaskExecut
 
     private final RemoteStoreNodeService remoteStoreNodeService;
 
+    private static Settings currentNodeSettings = Settings.EMPTY;
+
     /**
      * Task for the join task executor.
      *
@@ -145,12 +147,16 @@ public JoinTaskExecutor(
         this.logger = logger;
         this.rerouteService = rerouteService;
         this.remoteStoreNodeService = remoteStoreNodeService;
+        currentNodeSettings = settings;
+    }
+
+    public static Settings getCurrentNodeSettings() {
+        return currentNodeSettings;
     }
 
     @Override
     public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> joiningNodes) throws Exception {
         final ClusterTasksResult.Builder<Task> results = ClusterTasksResult.builder();
-
         final DiscoveryNodes currentNodes = currentState.nodes();
         boolean nodesChanged = false;
         ClusterState.Builder newState;
@@ -507,9 +513,12 @@ private static void ensureRemoteStoreNodesCompatibility(DiscoveryNode joiningNod
 
         assert existingNodes.isEmpty() == false;
 
-        CompatibilityMode remoteStoreCompatibilityMode = REMOTE_STORE_COMPATIBILITY_MODE_SETTING.get(metadata.settings());
-        if (STRICT.equals(remoteStoreCompatibilityMode)) {
+        CompatibilityMode remoteStoreCompatibilityMode = REMOTE_STORE_COMPATIBILITY_MODE_SETTING.get(getCurrentNodeSettings());
+        if (REMOTE_STORE_COMPATIBILITY_MODE_SETTING.exists(metadata.settings())) {
+            remoteStoreCompatibilityMode = REMOTE_STORE_COMPATIBILITY_MODE_SETTING.get(metadata.settings());
+        }
 
+        if (STRICT.equals(remoteStoreCompatibilityMode)) {
             DiscoveryNode existingNode = existingNodes.get(0);
             if (joiningNode.isRemoteStoreNode()) {
                 ensureRemoteStoreNodesCompatibility(joiningNode, existingNode);