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 f38cce95964..158a2393b4e 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;

Server Metrics

- <& ServerMetricsTmpl; mWrap = regionServer.getRegionServerMetrics().getRegionServerWrapper(); &> + <& ServerMetricsTmpl; mWrap = regionServer.getRegionServerMetrics().getRegionServerWrapper(); + mServerWrap = regionServer.getRpcServer().getMetrics().getHBaseServerWrapper(); &>
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 13ccc3bafc3..4f6a754e547 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. <%args> MetricsRegionServerWrapper mWrap; +MetricsHBaseServerWrapper mServerWrap; <%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 &>
- <& queueStats; mWrap = mWrap &> + <& queueStats; mWrap = mWrap; mServerWrap = mServerWrap; &>
@@ -184,16 +186,20 @@ MetricsRegionServerWrapper mWrap; <%def queueStats> <%args> MetricsRegionServerWrapper mWrap; +MetricsHBaseServerWrapper mServerWrap; + +
Compaction Queue Size Flush Queue SizeCall Queue Size (bytes)
<% mWrap.getCompactionQueueSize() %> <% mWrap.getFlushQueueSize() %><% StringUtils.TraditionalBinaryPrefix.long2String(mServerWrap.getTotalQueueSize(), + "", 1) %>
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 05bebb83c42..e514f5fdbd6 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; + } }