You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/02/27 16:26:53 UTC
hbase git commit: Revert "HBASE-20092 Fix
TestRegionMetrics#testRegionMetrics"
Repository: hbase
Updated Branches:
refs/heads/branch-2 b1cc47801 -> 367d31678
Revert "HBASE-20092 Fix TestRegionMetrics#testRegionMetrics"
This reverts commit ae288a7b41b02b9c3bb4498ba4a41bbd7d18b03d.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/367d3167
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/367d3167
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/367d3167
Branch: refs/heads/branch-2
Commit: 367d316781432addcebe923ee7f7bacab285174c
Parents: b1cc478
Author: Michael Stack <st...@apache.org>
Authored: Tue Feb 27 08:26:24 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Feb 27 08:26:47 2018 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/TestRegionLoad.java | 15 ++++------
.../apache/hadoop/hbase/TestRegionMetrics.java | 29 +++-----------------
2 files changed, 10 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/367d3167/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionLoad.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionLoad.java
index a390aca..d0484d6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionLoad.java
@@ -27,7 +27,6 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
import org.apache.hadoop.hbase.client.Admin;
@@ -35,6 +34,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.Threads;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -61,13 +61,12 @@ public class TestRegionLoad {
private static final TableName TABLE_2 = TableName.valueOf("table_2");
private static final TableName TABLE_3 = TableName.valueOf("table_3");
private static final TableName[] tables = new TableName[]{TABLE_1, TABLE_2, TABLE_3};
- private static final int MSG_INTERVAL = 500; // ms
@BeforeClass
public static void beforeClass() throws Exception {
// Make servers report eagerly. This test is about looking at the cluster status reported.
// Make it so we don't have to wait around too long to see change.
- UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", MSG_INTERVAL);
+ UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 500);
UTIL.startMiniCluster(4);
admin = UTIL.getAdmin();
admin.setBalancerRunning(false, true);
@@ -118,13 +117,11 @@ public class TestRegionLoad {
}
checkRegionsAndRegionLoads(tableRegions, regionLoads);
}
+ int pause = UTIL.getConfiguration().getInt("hbase.regionserver.msginterval", 3000);
// Just wait here. If this fixes the test, come back and do a better job.
// Would have to redo the below so can wait on cluster status changing.
- // Admin#getClusterMetrics retrieves data from HMaster. Admin#getRegionMetrics, by contrast,
- // get the data from RS. Hence, it will fail if we do the assert check before RS has done
- // the report.
- TimeUnit.MILLISECONDS.sleep(3 * MSG_INTERVAL);
+ Threads.sleep(2 * pause);
// Check RegionLoad matches the regionLoad from ClusterStatus
ClusterStatus clusterStatus
@@ -136,10 +133,10 @@ public class TestRegionLoad {
(v1, v2) -> {
throw new RuntimeException("impossible!!");
}, () -> new TreeMap<>(Bytes.BYTES_COMPARATOR)));
- LOG.debug("serverName=" + serverName + ", getRegionLoads=" +
+ LOG.info("serverName=" + serverName + ", getRegionLoads=" +
serverLoad.getRegionsLoad().keySet().stream().map(r -> Bytes.toString(r)).
collect(Collectors.toList()));
- LOG.debug("serverName=" + serverName + ", regionLoads=" +
+ LOG.info("serverName=" + serverName + ", regionLoads=" +
regionLoads.keySet().stream().map(r -> Bytes.toString(r)).
collect(Collectors.toList()));
compareRegionLoads(serverLoad.getRegionsLoad(), regionLoads);
http://git-wip-us.apache.org/repos/asf/hbase/blob/367d3167/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
index df57c49..1f9c519 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
@@ -25,8 +25,6 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -39,8 +37,6 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hbase.thirdparty.com.google.common.collect.Maps;
@@ -51,7 +47,6 @@ public class TestRegionMetrics {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRegionMetrics.class);
- private static final Logger LOG = LoggerFactory.getLogger(TestRegionMetrics.class);
private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static Admin admin;
@@ -59,13 +54,9 @@ public class TestRegionMetrics {
private static final TableName TABLE_2 = TableName.valueOf("table_2");
private static final TableName TABLE_3 = TableName.valueOf("table_3");
private static final TableName[] tables = new TableName[] { TABLE_1, TABLE_2, TABLE_3 };
- private static final int MSG_INTERVAL = 500; // ms
@BeforeClass
public static void beforeClass() throws Exception {
- // Make servers report eagerly. This test is about looking at the cluster status reported.
- // Make it so we don't have to wait around too long to see change.
- UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", MSG_INTERVAL);
UTIL.startMiniCluster(4);
admin = UTIL.getAdmin();
admin.balancerSwitch(false, true);
@@ -110,25 +101,13 @@ public class TestRegionMetrics {
checkRegionsAndRegionMetrics(tableRegions, regionMetrics);
}
- // Just wait here. If this fixes the test, come back and do a better job.
- // Would have to redo the below so can wait on cluster status changing.
- // Admin#getClusterMetrics retrieves data from HMaster. Admin#getRegionMetrics, by contrast,
- // get the data from RS. Hence, it will fail if we do the assert check before RS has done
- // the report.
- TimeUnit.MILLISECONDS.sleep(3 * MSG_INTERVAL);
-
- // Check RegionMetrics matches the RegionMetrics from ClusterMetrics
- for (Map.Entry<ServerName, ServerMetrics> entry : admin
- .getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS)).getLiveServerMetrics().entrySet()) {
+ // Check RegionMetrics matches the RegionMetrics from ClusterStatus
+ ClusterMetrics clusterStatus = admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS));
+ for (Map.Entry<ServerName, ServerMetrics> entry : clusterStatus.getLiveServerMetrics()
+ .entrySet()) {
ServerName serverName = entry.getKey();
ServerMetrics serverMetrics = entry.getValue();
List<RegionMetrics> regionMetrics = admin.getRegionMetrics(serverName);
- LOG.debug("serverName=" + serverName + ", getRegionLoads=" +
- serverMetrics.getRegionMetrics().keySet().stream().map(r -> Bytes.toString(r)).
- collect(Collectors.toList()));
- LOG.debug("serverName=" + serverName + ", regionLoads=" +
- regionMetrics.stream().map(r -> Bytes.toString(r.getRegionName())).
- collect(Collectors.toList()));
assertEquals(serverMetrics.getRegionMetrics().size(), regionMetrics.size());
}
}