Fixing UTs where node space causing shards to be unassigned

Signed-off-by: Dhiresh Jain <dhireshj@amazon.com>
opensearch-project · Jun 4, 2021 · ada9ef5 · ada9ef5
1 parent 41f8f36
commit ada9ef5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...t/java/com/amazon/opendistroforelasticsearch/security/AdvancedSecurityMigrationTests.java b/...t/java/com/amazon/opendistroforelasticsearch/security/AdvancedSecurityMigrationTests.java
@@ -255,7 +255,6 @@ private Settings.Builder getAdvSecSettings() {
                 .put(ConfigConstants.SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX, true)
                 .put(ConfigConstants.SECURITY_UNSUPPORTED_PASSIVE_INTERTRANSPORT_AUTH_INITIALLY, true)
                 .put(ConfigConstants.SECURITY_UNSUPPORTED_RESTAPI_ALLOW_SECURITYCONFIG_MODIFICATION, true)
-                .put("cluster.routing.allocation.disk.threshold_enabled", false)
                 .put("node.attr.custom_node", true);
     }
 
@@ -266,14 +265,12 @@ private Settings.Builder getAdvSecSettingsDualMode() {
 
     private Settings.Builder getSSLOnlyModeSettings() {
         return Settings.builder()
-                .put(ConfigConstants.SECURITY_SSL_ONLY, true)
-                .put("cluster.routing.allocation.disk.threshold_enabled", false);
+                .put(ConfigConstants.SECURITY_SSL_ONLY, true);
     }
 
     private Settings.Builder getDisabledSettings() {
         return Settings.builder()
-                .put(ConfigConstants.SECURITY_DISABLED, true)
-                .put("cluster.routing.allocation.disk.threshold_enabled", false);
+                .put(ConfigConstants.SECURITY_DISABLED, true);
     }
 
     // Create index with shards only in adv sec nodes

diff --git a/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java b/src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java
@@ -374,6 +374,7 @@ private Settings.Builder getMinimumNonSecurityNodeSettingsBuilder(final int node
                 .put("transport.tcp.port", tcpPort)
                 .put("http.port", httpPort)
                 //.put("http.enabled", true)
+                .put("cluster.routing.allocation.disk.threshold_enabled", false)
                 .put("http.cors.enabled", true)
                 .put("path.home", "./target");
     }