You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/02/12 10:00:36 UTC
[hbase] branch branch-2 updated: HBASE-21780: Avoid a wide line on
the RegionServer webUI for many ZooKeeper servers
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 9853f78 HBASE-21780: Avoid a wide line on the RegionServer webUI for many ZooKeeper servers
9853f78 is described below
commit 9853f788e84b5096e49c6c5e04257c78a306828a
Author: Sakthi <sa...@gmail.com>
AuthorDate: Thu Jan 24 21:20:35 2019 -0800
HBASE-21780: Avoid a wide line on the RegionServer webUI for many ZooKeeper servers
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 31 +++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index e3c38b9..8eb362a 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -51,6 +51,34 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
: masterAddressTracker.getMasterAddress();
int infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getMasterInfoPort();
</%java>
+
+<%class>
+ public String formatZKString() {
+ StringBuilder quorums = new StringBuilder();
+ String zkQuorum = regionServer.getZooKeeper().getQuorum();
+
+ if (null == zkQuorum) {
+ return quorums.toString();
+ }
+
+ String[] zks = zkQuorum.split(",");
+
+ if (zks.length == 0) {
+ return quorums.toString();
+ }
+
+ for(int i = 0; i < zks.length; ++i) {
+ quorums.append(zks[i].trim());
+
+ if (i != (zks.length - 1)) {
+ quorums.append("<br/>");
+ }
+ }
+
+ return quorums.toString();
+ }
+</%class>
+
<!DOCTYPE html>
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
@@ -177,7 +205,8 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
</tr>
<tr>
<td>ZooKeeper Quorum</td>
- <td><% regionServer.getZooKeeper().getQuorum() %></td>
+ <%escape #n>
+ <td><% formatZKString() %></td>
<td>Addresses of all registered ZK servers</td>
</tr>
<tr>