Return-Path: 
 <commits-return-30751-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
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 329EF18136
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue,  5 Jan 2016 00:25:58 +0000 (UTC)
Received: (qmail 85678 invoked by uid 500); 5 Jan 2016 00:25:58 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 85636 invoked by uid 500); 5 Jan 2016 00:25:58 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 85626 invoked by uid 99); 5 Jan 2016 00:25:58 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 00:25:58 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id DD6DDE07EE; Tue,  5 Jan 2016 00:25:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: apurtell@apache.org
To: commits@hbase.apache.org
Date: Tue, 05 Jan 2016 00:25:57 -0000
Message-Id: <ae43f409bf4149feae8d5153cca1938a@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] hbase git commit: HBASE-14976 Add RPC call queues to the web ui
 (Pallavi Adusumilli)

Repository: hbase
Updated Branches:
  refs/heads/0.98 cf38756ef -> ec1285cfb


HBASE-14976 Add RPC call queues to the web ui (Pallavi Adusumilli)

Conflicts:
	hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/22edb524
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/22edb524
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/22edb524

Branch: refs/heads/0.98
Commit: 22edb524995bfb95b545c6d44ccd17801cd7d02f
Parents: cf38756
Author: Mikhail Antonov <antonov@apache.org>
Authored: Sat Dec 19 12:44:30 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Mon Jan 4 15:51:48 2016 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 2 +-
 .../hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon   | 8 +++++++-
 .../java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/22edb524/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
----------------------------------------------------------------------
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 9dedd8e..f90ba14 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
@@ -104,7 +104,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
 
     <section>
     <h2>Server Metrics</h2>
-    <& ServerMetricsTmpl; mWrap = regionServer.getMetrics().getRegionServerWrapper(); &>
+    <& ServerMetricsTmpl; mWrap = regionServer.getMetrics().getRegionServerWrapper(); mServerWrap = regionServer.getRpcServer().getMetrics().getHBaseServerWrapper(); &>
     </section>
 
     <section>

http://git-wip-us.apache.org/repos/asf/hbase/blob/22edb524/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
index 80908df..3d17e6b 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
@@ -18,10 +18,12 @@ limitations under the License.
 </%doc>
 <%args>
 MetricsRegionServerWrapper mWrap;
+MetricsHBaseServerWrapper mServerWrap;
 </%args>
 <%import>
 java.util.*;
 org.apache.hadoop.hbase.regionserver.HRegionServer;
+org.apache.hadoop.hbase.ipc.MetricsHBaseServerWrapper;
 org.apache.hadoop.hbase.regionserver.MetricsRegionServerWrapper;
 org.apache.hadoop.hbase.util.Bytes;
 org.apache.hadoop.hbase.HRegionInfo;
@@ -62,7 +64,7 @@ java.lang.management.ManagementFactory;
             <& storeStats; mWrap = mWrap &>
         </div>
         <div class="tab-pane" id="tab_queueStats">
-            <& queueStats; mWrap = mWrap  &>
+            <& queueStats; mWrap = mWrap; mServerWrap = mServerWrap; &>
         </div>
     </div>
 </div>
@@ -183,16 +185,20 @@ MetricsRegionServerWrapper mWrap;
 <%def queueStats>
 <%args>
 MetricsRegionServerWrapper mWrap;
+MetricsHBaseServerWrapper mServerWrap;
 </%args>
 <table class="table table-striped">
 <tr>
     <th>Compaction Queue Size</th>
     <th>Flush Queue Size</th>
+    <th>Call Queue Size (bytes)</th>
 
 </tr>
 <tr>
     <td><% mWrap.getCompactionQueueSize() %></td>
     <td><% mWrap.getFlushQueueSize() %></td>
+    <td><% StringUtils.TraditionalBinaryPrefix.long2String(mServerWrap.getTotalQueueSize(),
+      "", 1) %></td>
 </tr>
 </table>
 </%def>

http://git-wip-us.apache.org/repos/asf/hbase/blob/22edb524/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java
index d276503..6d5f05c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java
@@ -31,8 +31,10 @@ import org.apache.hadoop.hbase.exceptions.RegionMovedException;
 @InterfaceAudience.Private
 public class MetricsHBaseServer {
   private MetricsHBaseServerSource source;
+  private MetricsHBaseServerWrapper serverWrapper;
 
   public MetricsHBaseServer(String serverName, MetricsHBaseServerWrapper wrapper) {
+    serverWrapper = wrapper;
     source = CompatibilitySingletonFactory.getInstance(MetricsHBaseServerSourceFactory.class)
                                           .create(serverName, wrapper);
   }
@@ -112,4 +114,8 @@ public class MetricsHBaseServer {
   public MetricsHBaseServerSource getMetricsSource() {
     return source;
   }
+
+  public MetricsHBaseServerWrapper getHBaseServerWrapper() {
+    return serverWrapper;
+  }
 }