@@ -52,6 +52,7 @@ org.apache.hadoop.hbase.master.RegionState;
52
52
org.apache.hadoop.hbase.master.ServerManager;
53
53
org.apache.hadoop.hbase.quotas.QuotaUtil;
54
54
org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
55
+ org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
55
56
org.apache.hadoop.hbase.rsgroup.RSGroupUtil;
56
57
org.apache.hadoop.hbase.security.access.PermissionStorage;
57
58
org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
@@ -698,17 +699,35 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
698
699
<th></th>
699
700
<th>ServerName</th>
700
701
<th>Stop time</th>
702
+ <%if !master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null %>
703
+ <%if RSGroupUtil.isRSGroupEnabled(master.getConfiguration()) %>
704
+ <th>RSGroup</th>
705
+ </%if>
706
+ </%if>
701
707
</tr>
702
708
<%java>
703
- DeadServer deadServerUtil = master.getServerManager().getDeadServers();
704
- ServerName [] deadServerNames = deadServers.toArray(new ServerName[deadServers.size()]);
705
- Arrays.sort(deadServerNames);
706
- for (ServerName deadServerName: deadServerNames) {
709
+ RSGroupInfoManager inMgr = null;
710
+ DeadServer deadServerUtil = master.getServerManager().getDeadServers();
711
+ ServerName [] deadServerNames = deadServers.toArray(new ServerName[deadServers.size()]);
712
+ Arrays.sort(deadServerNames);
713
+ if (!master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null
714
+ && RSGroupUtil.isRSGroupEnabled(master.getConfiguration())) {
715
+ inMgr = master.getRSGroupInfoManager();
716
+ }
717
+ for (ServerName deadServerName: deadServerNames) {
718
+ String rsGroupName = null;
719
+ if (inMgr != null){
720
+ RSGroupInfo groupInfo = inMgr.getRSGroupOfServer(deadServerName.getAddress());
721
+ rsGroupName = groupInfo == null ? RSGroupInfo.DEFAULT_GROUP : groupInfo.getName();
722
+ }
707
723
</%java>
708
724
<tr>
709
725
<th></th>
710
726
<td><% deadServerName %></td>
711
727
<td><% deadServerUtil.getTimeOfDeath(deadServerName) %></td>
728
+ <%if rsGroupName != null %>
729
+ <td><% rsGroupName %></td>
730
+ </%if>
712
731
</tr>
713
732
<%java>
714
733
}
0 commit comments