You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ha...@apache.org on 2023/03/09 09:10:19 UTC
[hbase] branch master updated: HBASE-27615 Add group of regionServer on Master webUI (#5010)
This is an automated email from the ASF dual-hosted git repository.
haxiaolin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 0491524eb16 HBASE-27615 Add group of regionServer on Master webUI (#5010)
0491524eb16 is described below
commit 0491524eb16d0196589a8a1215ba910ab1c97b27
Author: tianhang <ta...@gmail.com>
AuthorDate: Thu Mar 9 17:10:11 2023 +0800
HBASE-27615 Add group of regionServer on Master webUI (#5010)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Xiaolin Ha <ha...@apache.org>
---
.../hbase/tmpl/master/RegionServerListTmpl.jamon | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index a7e91d9b00b..10d87823ed8 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -35,6 +35,9 @@ HMaster master;
org.apache.hadoop.hbase.util.VersionInfo;
org.apache.hadoop.hbase.util.Pair;
org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
+ org.apache.hadoop.hbase.net.Address;
+ org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
+ org.apache.hadoop.hbase.rsgroup.RSGroupUtil;
</%import>
<%if (servers != null && servers.size() > 0)%>
@@ -91,6 +94,11 @@ Arrays.sort(serverNames);
<th>Version</th>
<th>Requests Per Second</th>
<th>Num. Regions</th>
+ <%if !master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null %>
+ <%if RSGroupUtil.isRSGroupEnabled(master.getConfiguration()) %>
+ <th style="vertical-align: middle;" rowspan="2">RSGroup</th>
+ </%if>
+ </%if>
</tr>
</thead>
<tbody>
@@ -101,6 +109,16 @@ Arrays.sort(serverNames);
String state = "Normal";
String masterVersion = VersionInfo.getVersion();
Set<ServerName> decommissionedServers = new HashSet<>(master.listDecommissionedRegionServers());
+ String rsGroupName = "default";
+ List<RSGroupInfo> groups;
+ Map<Address, RSGroupInfo> server2GroupMap = new HashMap<>();
+ if (!master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null
+ && RSGroupUtil.isRSGroupEnabled(master.getConfiguration())) {
+ groups = master.getRSGroupInfoManager().listRSGroups();
+ groups.forEach(group -> {
+ group.getServers().forEach(address -> server2GroupMap.put(address, group));
+ });
+ }
for (ServerName serverName: serverNames) {
if (decommissionedServers.contains(serverName)) {
state = "Decommissioned";
@@ -123,6 +141,10 @@ Arrays.sort(serverNames);
lastContact = (System.currentTimeMillis() - sl.getReportTimestamp())/1000;
}
long startcode = serverName.getStartcode();
+ if (!master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null
+ && RSGroupUtil.isRSGroupEnabled(master.getConfiguration())) {
+ rsGroupName = server2GroupMap.get(serverName.getAddress()).getName();
+ }
</%java>
<tr>
<td><& serverNameLink; serverName=serverName; &></td>
@@ -132,6 +154,11 @@ Arrays.sort(serverNames);
<td><% version %></td>
<td><% String.format("%,.0f", requestsPerSecond) %></td>
<td><% String.format("%,d", numRegionsOnline) %></td>
+ <%if !master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null %>
+ <%if RSGroupUtil.isRSGroupEnabled(master.getConfiguration()) %>
+ <td><% rsGroupName %></td>
+ </%if>
+ </%if>
</tr>
<%java>
}