Addressing comments

Signed-off-by: Shourya Dutta Biswas <[email protected]>
shourya035 · Jul 18, 2024 · 06c34bd · 06c34bd
1 parent d39227b
commit 06c34bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...er/src/internalClusterTest/java/org/opensearch/remotemigration/MigrationBaseTestCase.java b/...er/src/internalClusterTest/java/org/opensearch/remotemigration/MigrationBaseTestCase.java
@@ -297,8 +297,8 @@ public void completeDocRepToRemoteMigration() {
                 .prepareUpdateSettings()
                 .setPersistentSettings(
                     Settings.builder()
-                        .put(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey(), "strict")
-                        .put(MIGRATION_DIRECTION_SETTING.getKey(), "none")
+                        .putNull(REMOTE_STORE_COMPATIBILITY_MODE_SETTING.getKey())
+                        .putNull(MIGRATION_DIRECTION_SETTING.getKey())
                 )
                 .get()
                 .isAcknowledged()

diff --git a/...va/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/...va/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
@@ -285,7 +285,7 @@ public ClusterState execute(final ClusterState currentState) {
                      flow. That way we are not interfering with the usual settings update
                      and the cluster state mutation that comes along with it
                     */
-                    if (isCompatibilityModeChanging == true && isSwitchToStrictCompatibilityMode(request) == true) {
+                    if (isCompatibilityModeChanging && isSwitchToStrictCompatibilityMode(request)) {
                         ClusterState newStateAfterIndexMdChanges = finalizeMigration(clusterState);
                         changed = newStateAfterIndexMdChanges != currentState;
                         return newStateAfterIndexMdChanges;
@@ -307,6 +307,7 @@ public ClusterState execute(final ClusterState currentState) {
     public boolean validateCompatibilityModeSettingRequest(ClusterUpdateSettingsRequest request, ClusterState clusterState) {
         Settings settings = Settings.builder().put(request.persistentSettings()).put(request.transientSettings()).build();
         if (RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.exists(settings)) {
+            logger.info("Compat mode setting : {}", RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.get(settings).mode);
             String value = RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING.get(settings).mode;
             validateAllNodesOfSameVersion(clusterState.nodes());
             if (RemoteStoreNodeService.CompatibilityMode.STRICT.mode.equals(value)) {