diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java index 8a216c5339..0030e6dcc8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; @@ -36,7 +37,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,7 +83,7 @@ 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 @@ -98,29 +98,29 @@ public class TestMasterMetrics { .build(); masterSource.init(); request.setLoad(sl); + ServerLoad oldLoad = master.getServerManager().getLoad(serverName); + long totalNumberBefore = (oldLoad) != null? oldLoad.getTotalNumberOfRequests() : 0; master.getMasterRpcServices().regionServerReport(null, request.build()); - - metricsHelper.assertCounter("cluster_requests", 10000, masterSource); + metricsHelper.assertCounter("cluster_requests", 10000 - totalNumberBefore, masterSource); sl = ClusterStatusProtos.ServerLoad.newBuilder() .setTotalNumberOfRequests(15000) .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", 15000 - totalNumberBefore, masterSource); + master.getMasterRpcServices().regionServerReport(null, request.build()); - metricsHelper.assertCounter("cluster_requests", 15000, masterSource); + metricsHelper.assertCounter("cluster_requests", 15000 - totalNumberBefore, 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);