You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/07/02 20:53:27 UTC
svn commit: r1499060 -
/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Author: stack
Date: Tue Jul 2 18:53:27 2013
New Revision: 1499060
URL: http://svn.apache.org/r1499060
Log:
HBASE-8812 Avoid a wide line on the HMaster webUI if we have many ZooKeeper servers
Modified:
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1499060&r1=1499059&r2=1499060&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Tue Jul 2 18:53:27 2013
@@ -57,6 +57,34 @@ ServerManager serverManager = master.get
AssignmentManager assignmentManager = master.getAssignmentManager();
</%java>
+<%class>
+ public String formatZKString() {
+ StringBuilder quorums = new StringBuilder();
+ String zkQuorum = master.getZooKeeperWatcher().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()).append(",");
+
+ if ((i+1) % 4 == 0 && i != (zks.length - 1)) {
+ quorums.append("<br/>");
+ }
+ }
+
+ quorums.setLength(quorums.length() - 1);
+ return quorums.toString();
+ }
+</%class>
+
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
@@ -211,7 +239,8 @@ AssignmentManager assignmentManager = ma
</tr>
<tr>
<td>Zookeeper Quorum</td>
- <td><% master.getZooKeeperWatcher().getQuorum() %></td>
+ <%escape #n>
+ <td> <% formatZKString() %> </td>
<td>Addresses of all registered ZK servers. For more, see <a href="/zk.jsp">zk dump</a>.</td>
</tr>
<tr>