You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/07/29 23:52:01 UTC
[23/47] hbase git commit: HBASE-18354 Fix TestMasterMetrics that were
disabled by Proc-V2 AM in HBASE-14614 (Vladimir Rodionov)
HBASE-18354 Fix TestMasterMetrics that were disabled by Proc-V2 AM in HBASE-14614 (Vladimir Rodionov)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fabab8c2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fabab8c2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fabab8c2
Branch: refs/heads/HBASE-18426
Commit: fabab8c23f73488d2e113a2fe19b35b1433df959
Parents: 8f00658
Author: Stephen Yuan Jiang <sy...@gmail.com>
Authored: Mon Jul 24 14:52:04 2017 -0700
Committer: Stephen Yuan Jiang <sy...@gmail.com>
Committed: Mon Jul 24 14:52:04 2017 -0700
----------------------------------------------------------------------
.../hadoop/hbase/master/TestMasterMetrics.java | 23 ++++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fabab8c2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
index 8a216c5..77404d4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
@@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -83,44 +82,44 @@ public class TestMasterMetrics {
}
}
- @Ignore @Test(timeout = 300000)
+ @Test(timeout = 300000)
public void testClusterRequests() throws Exception {
// sending fake request to master to see how metric value has changed
+
RegionServerStatusProtos.RegionServerReportRequest.Builder request =
RegionServerStatusProtos.RegionServerReportRequest.newBuilder();
ServerName serverName = cluster.getMaster(0).getServerName();
request.setServer(ProtobufUtil.toServerName(serverName));
+ long expectedRequestNumber = 10000;
MetricsMasterSource masterSource = master.getMasterMetrics().getMetricsSource();
ClusterStatusProtos.ServerLoad sl = ClusterStatusProtos.ServerLoad.newBuilder()
- .setTotalNumberOfRequests(10000)
+ .setTotalNumberOfRequests(expectedRequestNumber)
.build();
- masterSource.init();
request.setLoad(sl);
+
master.getMasterRpcServices().regionServerReport(null, request.build());
+ metricsHelper.assertCounter("cluster_requests", expectedRequestNumber, masterSource);
- metricsHelper.assertCounter("cluster_requests", 10000, masterSource);
+ expectedRequestNumber = 15000;
sl = ClusterStatusProtos.ServerLoad.newBuilder()
- .setTotalNumberOfRequests(15000)
+ .setTotalNumberOfRequests(expectedRequestNumber)
.build();
request.setLoad(sl);
- master.getMasterRpcServices().regionServerReport(null, request.build());
-
- metricsHelper.assertCounter("cluster_requests", 15000, masterSource);
master.getMasterRpcServices().regionServerReport(null, request.build());
+ metricsHelper.assertCounter("cluster_requests", expectedRequestNumber, masterSource);
- metricsHelper.assertCounter("cluster_requests", 15000, masterSource);
master.stopMaster();
}
- @Ignore @Test
+ @Test
public void testDefaultMasterMetrics() throws Exception {
MetricsMasterSource masterSource = master.getMasterMetrics().getMetricsSource();
metricsHelper.assertGauge( "numRegionServers", 2, masterSource);
- metricsHelper.assertGauge( "averageLoad", 2, masterSource);
+ metricsHelper.assertGauge( "averageLoad", 1, masterSource);
metricsHelper.assertGauge( "numDeadRegionServers", 0, masterSource);
metricsHelper.assertGauge("masterStartTime", master.getMasterStartTime(), masterSource);