Fix role filtering from legacy settings

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
opensearch-project · Mar 24, 2023 · 306e6a9 · 306e6a9
1 parent dcddbf6
commit 306e6a9
Showing 1 changed file with 8 additions and 1 deletion.
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,7 +285,14 @@ 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.isEnabledByDefault(settings)).collect(Collectors.toSet());
+            return roleMap.values()
+                .stream()
+                .filter(
+                    s -> !s.roleName().equals(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE.roleName())
+                        && s.legacySetting() != null
+                        && s.legacySetting().get(settings)
+                )
+                .collect(Collectors.toSet());
         }
     }