Override isEnabledByDefault() for cluster manager role

Signed-off-by: Sandesh Kumar <[email protected]>
opensearch-project · Mar 24, 2023 · 10493ee · 10493ee
1 parent 306e6a9
commit 10493ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
@@ -285,14 +285,7 @@ public static Set<DiscoveryNodeRole> getRolesFromSettings(final Settings setting
             validateLegacySettings(settings, roleMap);
             return Collections.unmodifiableSet(new HashSet<>(NODE_ROLES_SETTING.get(settings)));
         } else {
-            return roleMap.values()
-                .stream()
-                .filter(
-                    s -> !s.roleName().equals(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE.roleName())
-                        && s.legacySetting() != null
-                        && s.legacySetting().get(settings)
-                )
-                .collect(Collectors.toSet());
+            return roleMap.values().stream().filter(s -> s.isEnabledByDefault(settings)).collect(Collectors.toSet());
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeRole.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeRole.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
+import org.opensearch.common.Booleans;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
@@ -275,7 +276,7 @@ public void validateRole(List<DiscoveryNodeRole> roles) {
 
         @Override
         public boolean isEnabledByDefault(final Settings settings) {
-            return settings.getAsBoolean("node.master", true);
+            return !Booleans.isBoolean(settings.get("node.master"));
         }
     };