Address comments

Signed-off-by: Lakshya Taragi <[email protected]>
ltaragi · Apr 8, 2024 · 7237a5f · 7237a5f
1 parent 238ed34
commit 7237a5f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 35 deletions.
diff --git a/...rnalClusterTest/java/org/opensearch/remotemigration/RemoteStoreMigrationAllocationIT.java b/...rnalClusterTest/java/org/opensearch/remotemigration/RemoteStoreMigrationAllocationIT.java
@@ -31,8 +31,6 @@
 
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REMOTE_STORE_ENABLED;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.CompatibilityMode.MIXED;
-import static org.opensearch.node.remotestore.RemoteStoreNodeService.CompatibilityMode.STRICT;
-import static org.opensearch.node.remotestore.RemoteStoreNodeService.Direction.NONE;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.Direction.REMOTE_STORE;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING;
 import static org.opensearch.node.remotestore.RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING;
@@ -328,15 +326,27 @@ public void initializeCluster(boolean remoteClusterManager) {
         client = internalCluster().client();
     }
 
+    // assign settings to be updated randomly as persistent or transient
+    private static void randomlyAssignPersistentOrTransient(Settings.Builder settingsBuilder) {
+        updateSettingsRequest.persistentSettings(Settings.EMPTY);
+        updateSettingsRequest.transientSettings(Settings.EMPTY);
+        boolean isPersistentSetting = randomBoolean();
+        if (isPersistentSetting) {
+            updateSettingsRequest.persistentSettings(settingsBuilder);
+        } else {
+            updateSettingsRequest.transientSettings(settingsBuilder);
+        }
+    }
+
     // set the compatibility mode of cluster [strict, mixed]
     public static void setClusterMode(String mode) {
-        updateSettingsRequest.persistentSettings(Settings.builder().put(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(), mode));
+        randomlyAssignPersistentOrTransient(Settings.builder().put(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(), mode));
         assertAcked(internalCluster().client().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
     }
 
     // set the migration direction for cluster [remote_store, docrep, none]
     public static void setDirection(String direction) {
-        updateSettingsRequest.persistentSettings(Settings.builder().put(MIGRATION_DIRECTION_SETTING.getKey(), direction));
+        randomlyAssignPersistentOrTransient(Settings.builder().put(MIGRATION_DIRECTION_SETTING.getKey(), direction));
         assertAcked(internalCluster().client().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
     }
 

diff --git a/...va/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/...va/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
@@ -36,7 +36,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.OpenSearchException;
-import org.opensearch.Version;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
 import org.opensearch.cluster.AckedClusterStateUpdateTask;
@@ -46,6 +45,7 @@
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.node.DiscoveryNode;
+import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.routing.allocation.AllocationService;
 import org.opensearch.cluster.service.ClusterManagerTaskKeys;
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
@@ -54,6 +54,7 @@
 import org.opensearch.common.Priority;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.settings.ClusterSettings;
+import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -62,9 +63,7 @@
 import org.opensearch.transport.TransportService;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -145,7 +144,6 @@ protected void clusterManagerOperation(
         final ClusterState state,
         final ActionListener<ClusterUpdateSettingsResponse> listener
     ) {
-        validateCompatibilityModeSettingRequest(request, state);
         final SettingsUpdater updater = new SettingsUpdater(clusterSettings);
         clusterService.submitStateUpdateTask(
             "cluster_update_settings",
@@ -260,6 +258,7 @@ public void onFailure(String source, Exception e) {
 
                 @Override
                 public ClusterState execute(final ClusterState currentState) {
+                    validateCompatibilityModeSettingRequest(request, state);
                     final ClusterState clusterState = updater.updateSettings(
                         currentState,
                         clusterSettings.upgradeSettings(request.transientSettings()),
@@ -279,42 +278,39 @@ public ClusterState execute(final ClusterState currentState) {
      * @param clusterState current state of cluster, for information on nodes
      */
     public static void validateCompatibilityModeSettingRequest(ClusterUpdateSettingsRequest request, ClusterState clusterState) {
-        if (RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.exists(request.persistentSettings())) {
-            String value = request.persistentSettings()
-                .get(RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey())
-                .toLowerCase();
-            List<DiscoveryNode> discoveryNodeList = new ArrayList<>(clusterState.nodes().getNodes().values());
-            validateAllNodesOfSameVersion(discoveryNodeList);
+        Settings settings = Settings.builder().put(request.persistentSettings()).put(request.transientSettings()).build();
+        if (RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.exists(settings)) {
+            String value = settings.get(RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey()).toLowerCase(Locale.ROOT);
+            validateAllNodesOfSameVersion(clusterState.nodes());
             if (value.equals(RemoteStoreNodeService.CompatibilityMode.STRICT.mode)) {
-                validateAllNodesOfSameType(discoveryNodeList);
+                validateAllNodesOfSameType(clusterState.nodes());
             }
         }
     }
 
     /**
      * Verifies that while trying to change the compatibility mode, all nodes must have the same version.
      * If not, it throws SettingsException error
-     * @param discoveryNodeList list of the current discovery nodes in the cluster
+     * @param discoveryNodes current discovery nodes in the cluster
      */
-    private static void validateAllNodesOfSameVersion(List<DiscoveryNode> discoveryNodeList) {
-        Set<Version> versions = discoveryNodeList.stream().map(DiscoveryNode::getVersion).collect(Collectors.toSet());
-        if (versions.size() != 1) {
-            throw new SettingsException(
-                "can not change the compatibility mode when all the nodes in cluster are not of the same version. Present versions: "
-                    + versions
-            );
+    private static void validateAllNodesOfSameVersion(DiscoveryNodes discoveryNodes) {
+        if (discoveryNodes.getMaxNodeVersion().equals(discoveryNodes.getMinNodeVersion()) == false) {
+            throw new SettingsException("can not change the compatibility mode when all the nodes in cluster are not of the same version");
         }
     }
 
     /**
      * Verifies that while trying to switch to STRICT compatibility mode, all nodes must be of the
      * same type (all remote or all non-remote). If not, it throws SettingsException error
-     * @param discoveryNodeList list of the current discovery nodes in the cluster
+     * @param discoveryNodes current discovery nodes in the cluster
      */
-    private static void validateAllNodesOfSameType(List<DiscoveryNode> discoveryNodeList) {
-        Optional<DiscoveryNode> remoteNode = discoveryNodeList.stream().filter(DiscoveryNode::isRemoteStoreNode).findFirst();
-        Optional<DiscoveryNode> nonRemoteNode = discoveryNodeList.stream().filter(dn -> dn.isRemoteStoreNode() == false).findFirst();
-        if (remoteNode.isPresent() && nonRemoteNode.isPresent()) {
+    private static void validateAllNodesOfSameType(DiscoveryNodes discoveryNodes) {
+        Set<Boolean> nodeTypes = discoveryNodes.getNodes()
+            .values()
+            .stream()
+            .map(DiscoveryNode::isRemoteStoreNode)
+            .collect(Collectors.toSet());
+        if (nodeTypes.size() != 1) {
             throw new SettingsException(
                 "can not switch to STRICT compatibility mode when the cluster contains both remote and non-remote nodes"
             );

diff --git a/.../org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java b/.../org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java
@@ -76,8 +76,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.hamcrest.Matchers.*;
-import static org.opensearch.cluster.coordination.JoinTaskExecutorTests.*;
+import static org.opensearch.cluster.coordination.JoinTaskExecutorTests.SEGMENT_REPO;
+import static org.opensearch.cluster.coordination.JoinTaskExecutorTests.TRANSLOG_REPO;
+import static org.opensearch.cluster.coordination.JoinTaskExecutorTests.remoteStoreNodeAttributes;
 import static org.opensearch.cluster.routing.allocation.RemoteStoreMigrationAllocationDeciderTests.getNonRemoteNode;
 import static org.opensearch.cluster.routing.allocation.RemoteStoreMigrationAllocationDeciderTests.getRemoteNode;
 import static org.opensearch.common.util.FeatureFlags.REMOTE_STORE_MIGRATION_EXPERIMENTAL;
@@ -86,6 +87,9 @@
 import static org.opensearch.test.ClusterServiceUtils.setState;
 import static org.opensearch.test.VersionUtils.randomCompatibleVersion;
 import static org.opensearch.test.VersionUtils.randomOpenSearchVersion;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 
 public class TransportClusterManagerNodeActionTests extends OpenSearchTestCase {
     private static ThreadPool threadPool;
@@ -779,7 +783,10 @@ public void testDontAllowSwitchingCompatibilityModeForClusterWithMultipleVersion
             .put(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(), RemoteStoreNodeService.CompatibilityMode.MIXED)
             .build();
         Settings intendedCompatibilityModeSettings = Settings.builder()
-            .put(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(), toStrictMode ? RemoteStoreNodeService.CompatibilityMode.STRICT : RemoteStoreNodeService.CompatibilityMode.MIXED)
+            .put(
+                REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(),
+                toStrictMode ? RemoteStoreNodeService.CompatibilityMode.STRICT : RemoteStoreNodeService.CompatibilityMode.MIXED
+            )
             .build();
         ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
         request.persistentSettings(intendedCompatibilityModeSettings);
@@ -826,9 +833,7 @@ public void testDontAllowSwitchingCompatibilityModeForClusterWithMultipleVersion
         );
         assertThat(
             exception.getMessage(),
-            containsString(
-                "can not change the compatibility mode when all the nodes in cluster are not of the same version. Present versions: ["
-            )
+            containsString("can not change the compatibility mode when all the nodes in cluster are not of the same version")
         );
 
         // changing compatibility mode when all nodes are of the same version