Repository: hbase Updated Branches: refs/heads/hbase-12439 e0365df9d -> 4b541d638
HBASE-17772 IntegrationTestRSGroup won't run Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b541d63 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b541d63 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b541d63 Branch: refs/heads/hbase-12439 Commit: 4b541d63804e752f536560f7d96e222c0ffd877c Parents: e0365df Author: Michael Stack <st...@apache.org> Authored: Fri Mar 10 19:50:53 2017 -0800 Committer: Michael Stack <st...@apache.org> Committed: Fri Mar 10 19:50:53 2017 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java | 4 ++-- .../org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4b541d63/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java index 6b1f1a7..5c099c8 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.junit.After; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.experimental.categories.Category; /** @@ -37,7 +37,7 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase { private final static Log LOG = LogFactory.getLog(IntegrationTestRSGroup.class); private static boolean initialized = false; - @BeforeClass + @Before public void beforeMethod() throws Exception { if(!initialized) { LOG.info("Setting up IntegrationTestRSGroup"); http://git-wip-us.apache.org/repos/asf/hbase/blob/4b541d63/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java index 5f9116b..59853a5 100644 --- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java @@ -162,7 +162,14 @@ public abstract class TestRSGroupsBase { ClusterStatus status = TEST_UTIL.getHBaseClusterInterface().getClusterStatus(); for(ServerName serverName : status.getServers()) { for(RegionLoad rl : status.getLoad(serverName).getRegionsLoad().values()) { - TableName tableName = HRegionInfo.getTable(rl.getName()); + TableName tableName = null; + try { + tableName = HRegionInfo.getTable(rl.getName()); + } catch (IllegalArgumentException e) { + LOG.warn("Failed parse a table name from regionname=" + + Bytes.toStringBinary(rl.getName())); + continue; + } if(!map.containsKey(tableName)) { map.put(tableName, new TreeMap<>()); }
