You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/01/05 01:25:57 UTC
[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 <an...@apache.org>
Authored: Sat Dec 19 12:44:30 2015 -0800
Committer: Andrew Purtell <ap...@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;
+ }
}
[2/2] hbase git commit: Amend HBASE-14976 fix tests
Posted by ap...@apache.org.
Amend HBASE-14976 fix tests
Signed-off-by: Mikhail Antonov <an...@apache.org>
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec1285cf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec1285cf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec1285cf
Branch: refs/heads/0.98
Commit: ec1285cfb5b884b09c2f0d8e38cf89a1f146208e
Parents: 22edb52
Author: Pallavi Adusumilli <pa...@fb.com>
Authored: Mon Dec 21 10:57:25 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Jan 4 16:09:07 2016 -0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/TestRSStatusServlet.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ec1285cf/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
index 5a12eb2..c878209 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
@@ -48,6 +48,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
+import org.apache.hadoop.hbase.ipc.MetricsHBaseServer;
+import org.apache.hadoop.hbase.ipc.MetricsHBaseServerWrapperStub;
+import org.apache.hadoop.hbase.ipc.RpcServerInterface;
/**
* Tests for the region server status page and its template.
@@ -56,7 +59,8 @@ import org.apache.hadoop.hbase.io.hfile.CacheConfig;
public class TestRSStatusServlet {
private static final Log LOG = LogFactory.getLog(TestRSStatusServlet.class);
private HRegionServer rs;
-
+ private RpcServerInterface rpcServer;
+
static final int FAKE_IPC_PORT = 1585;
static final int FAKE_WEB_PORT = 1586;
@@ -71,8 +75,10 @@ public class TestRSStatusServlet {
@Before
public void setupBasicMocks() throws IOException, ServiceException {
rs = Mockito.mock(HRegionServer.class);
+ rpcServer = Mockito.mock(RpcServerInterface.class);
Mockito.doReturn(HBaseConfiguration.create())
.when(rs).getConfiguration();
+ Mockito.doReturn(rpcServer).when(rs).getRpcServer();
Mockito.doReturn(fakeResponse).when(rs).getServerInfo(
(RpcController)Mockito.any(), (GetServerInfoRequest)Mockito.any());
// Fake ZKW
@@ -94,6 +100,10 @@ public class TestRSStatusServlet {
MetricsRegionServer rms = Mockito.mock(MetricsRegionServer.class);
Mockito.doReturn(new MetricsRegionServerWrapperStub()).when(rms).getRegionServerWrapper();
Mockito.doReturn(rms).when(rs).getMetrics();
+
+ MetricsHBaseServer ms = Mockito.mock(MetricsHBaseServer.class);
+ Mockito.doReturn(new MetricsHBaseServerWrapperStub()).when(ms).getHBaseServerWrapper();
+ Mockito.doReturn(ms).when(rpcServer).getMetrics();
}
@Test