HBASE-14976 Add RPC call queues to the web ui (Pallavi Adusumilli)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c921ea9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c921ea9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c921ea9 Branch: refs/heads/hbase-12439 Commit: 8c921ea94f330b91d4fd55aa1706fc64b1646de1 Parents: b68542e Author: Mikhail Antonov <anto...@apache.org> Authored: Sat Dec 19 12:44:30 2015 -0800 Committer: Mikhail Antonov <anto...@apache.org> Committed: Sat Dec 19 12:44:30 2015 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 3 ++- .../hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon | 8 +++++++- .../java/org/apache/hadoop/hbase/ipc/MetricsHBaseServer.java | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8c921ea9/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 f38cce9..158a239 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,8 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; <section> <h2>Server Metrics</h2> - <& ServerMetricsTmpl; mWrap = regionServer.getRegionServerMetrics().getRegionServerWrapper(); &> + <& ServerMetricsTmpl; mWrap = regionServer.getRegionServerMetrics().getRegionServerWrapper(); + mServerWrap = regionServer.getRpcServer().getMetrics().getHBaseServerWrapper(); &> </section> <section> http://git-wip-us.apache.org/repos/asf/hbase/blob/8c921ea9/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 13ccc3b..4f6a754 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; @@ -61,7 +63,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> @@ -184,16 +186,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/8c921ea9/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 05bebb8..e514f5f 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 @@ -32,8 +32,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); } @@ -115,4 +117,8 @@ public class MetricsHBaseServer { public MetricsHBaseServerSource getMetricsSource() { return source; } + + public MetricsHBaseServerWrapper getHBaseServerWrapper() { + return serverWrapper; + } }