Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 160631063C for ; Tue, 2 Jul 2013 18:51:21 +0000 (UTC) Received: (qmail 94890 invoked by uid 500); 2 Jul 2013 18:51:20 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 94811 invoked by uid 500); 2 Jul 2013 18:51:19 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 94804 invoked by uid 99); 2 Jul 2013 18:51:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 18:51:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 18:51:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1EB37238889B; Tue, 2 Jul 2013 18:50:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1499056 - /hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Date: Tue, 02 Jul 2013 18:50:58 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130702185058.1EB37238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Tue Jul 2 18:50:57 2013 New Revision: 1499056 URL: http://svn.apache.org/r1499056 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=1499056&r1=1499055&r2=1499056&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:50:57 2013 @@ -57,6 +57,34 @@ ServerManager serverManager = master.get AssignmentManager assignmentManager = master.getAssignmentManager(); +<%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("
"); + } + } + + quorums.setLength(quorums.length() - 1); + return quorums.toString(); + } + + @@ -211,7 +239,8 @@ AssignmentManager assignmentManager = ma Zookeeper Quorum - <% master.getZooKeeperWatcher().getQuorum() %> + <%escape #n> + <% formatZKString() %> Addresses of all registered ZK servers. For more, see zk dump.