Changing roles counting behavior

sandeshkr419 · Feb 9, 2023 · 8234c2a · 8234c2a
1 parent 415b06c
commit 8234c2a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
@@ -240,12 +240,13 @@ private Counts(final List<NodeInfo> nodeInfos) {
                     for (DiscoveryNodeRole role : nodeInfo.getNode().getRoles()) {
                         // TODO: Remove the 'if' condition and only keep the statement in 'else' after removing MASTER_ROLE.
                         // As of 2.0, CLUSTER_MANAGER_ROLE is added, and it should be taken as MASTER_ROLE
-                        if (role.isClusterManager()) {
-                            roles.merge(DiscoveryNodeRole.MASTER_ROLE.roleName(), 1, Integer::sum);
-                            roles.merge(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE.roleName(), 1, Integer::sum);
-                        } else {
-                            roles.merge(role.roleName(), 1, Integer::sum);
-                        }
+//                        if (role.isClusterManager()) {
+//                            roles.merge(DiscoveryNodeRole.MASTER_ROLE.roleName(), 1, Integer::sum);
+//                            roles.merge(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE.roleName(), 1, Integer::sum);
+//                        } else {
+//                            roles.merge(role.roleName(), 1, Integer::sum);
+//                        }
+                        roles.merge(role.roleName(), 1, Integer::sum);
                     }
                 }
             }