From ef4269526e8b3e389b385cdefc637d7a7c9f4118 Mon Sep 17 00:00:00 2001
From: smitajoshi <smitha.joshi@cloudera.com>
Date: Mon, 23 Oct 2023 15:13:11 +0530
Subject: [PATCH] HDDS-9303. Ozone Manager : Display leader information in
 table format and highlight current node. Review Comments

---
 .../java/org/apache/hadoop/ozone/OmUtils.java     | 15 +++++----------
 .../org/apache/hadoop/ozone/om/OzoneManager.java  | 14 +++++++++++---
 .../webapps/ozoneManager/om-overview.html         | 11 +++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index d0781cecbb76..33bbe2cfed68 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -825,22 +825,17 @@ public static List<Map<String, String>> format(List<ServiceInfo> nodes, int port
            if (info.getNodeType() == HddsProtos.NodeType.OM) {
                String role = info.getOmRoleInfo().getNodeId().equals(leaderId) ? "LEADER" : "FOLLOWER";
                Map<String, String> omInfo = new HashMap<>();
-               omInfo.put("HostName", info.getHostname());
-               omInfo.put("Node-Id", info.getOmRoleInfo().getNodeId());
-               omInfo.put("Ratis-Port", String.valueOf(port));
-               omInfo.put("Role", role);
+               omInfo.put("hostName", info.getHostname());
+               omInfo.put("nodeId", info.getOmRoleInfo().getNodeId());
+               omInfo.put("ratisPort", String.valueOf(port));
+               omInfo.put("role", role);
 
                omInfoList.add(omInfo);
                count++;
            }
        }
-       // Print Stand-alone if only one OM exists
-       if (count == 1) {
-           // Return an empty list to indicate "STANDALONE"
-           return Collections.emptyList();
-       } else {
+       // Return omInfoList if count ==1 or count >=1
            return omInfoList;
-       }
   }
 
   /**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 1d264ec68050..37429b0f925a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -3009,6 +3009,8 @@ public String getRpcPort() {
   @Override
   public List<Map<String, String>> getRatisRoles() {
     List<ServiceInfo> serviceList;
+    List<Map<String, String>> resultList = new ArrayList<>();
+    Map<String, String> messageException = new HashMap<>();
     int port = omNodeDetails.getRatisPort();
     RaftPeer leaderId;
     if (isRatisEnabled) {
@@ -3016,16 +3018,22 @@ public List<Map<String, String>> getRatisRoles() {
         leaderId = omRatisServer.getLeader();
         if (leaderId == null) {
           LOG.error("No leader found");
-          return Collections.emptyList();
+          messageException.put("Message", "Exception: Not a leader");
+          resultList.add(messageException);
+          return resultList;
         }
         serviceList = getServiceList();
       } catch (IOException e) {
         LOG.error("IO-Exception Occurred", e);
-        return Collections.emptyList();
+        messageException.put("Message", "IO-Exception Occurred");
+        resultList.add(messageException);
+        return resultList;
       }
       return OmUtils.format(serviceList, port, leaderId.getId().toString());
     } else {
-      return Collections.emptyList();
+      messageException.put("Message", "Exception: Ratis Disabled");
+      resultList.add(messageException);
+      return resultList;
     }
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html b/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html
index e1e26270c9ec..6d51ede410b9 100644
--- a/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html
+++ b/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html
@@ -56,19 +56,18 @@ <h2>OM Roles (HA)</h2>
             <th>Role</th>
         </tr>
         </thead>
-        <tbody>
-        <tr class="om-roles-background" ng-repeat="roles in $ctrl.overview.jmx.RatisRoles"
-            ng-if="$ctrl.role.Id == roles[2].value">
+        <tbody ng-repeat="roles in $ctrl.overview.jmx.RatisRoles">
+        <tr class="om-roles-background" ng-if="$ctrl.role.Id == roles[3].value">
+            <td>{{roles[0].value}}</td>
             <td>{{roles[3].value}}</td>
             <td>{{roles[2].value}}</td>
             <td>{{roles[1].value}}</td>
-            <td>{{roles[0].value}}</td>
         </tr>
-        <tr ng-repeat="roles in $ctrl.overview.jmx.RatisRoles" ng-if="$ctrl.role.Id != roles[2].value">
+        <tr ng-if="$ctrl.role.Id != roles[3].value">
+            <td>{{roles[0].value}}</td>
             <td>{{roles[3].value}}</td>
             <td>{{roles[2].value}}</td>
             <td>{{roles[1].value}}</td>
-            <td>{{roles[0].value}}</td>
         </tr>
         </tbody>
     </table>