From 9853f788e84b5096e49c6c5e04257c78a306828a Mon Sep 17 00:00:00 2001 From: Sakthi Date: Thu, 24 Jan 2019 21:20:35 -0800 Subject: [PATCH] HBASE-21780: Avoid a wide line on the RegionServer webUI for many ZooKeeper servers Signed-off-by: Peter Somogyi --- .../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 e3c38b923b0..8eb362a03ba 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(); + +<%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("
"); + } + } + + return quorums.toString(); + } + + @@ -177,7 +205,8 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; ZooKeeper Quorum - <% regionServer.getZooKeeper().getQuorum() %> + <%escape #n> + <% formatZKString() %> Addresses of all registered ZK servers