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 2017/07/19 23:21:54 UTC
[18/22] hbase git commit: HBASE-16430 Fix RegionServer Group's bug
when moving multiple tables (Guangxu Cheng)
HBASE-16430 Fix RegionServer Group's bug when moving multiple tables (Guangxu Cheng)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c69283c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c69283c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c69283c
Branch: refs/heads/HBASE-15631-branch-1
Commit: 8c69283c5b42e4f12f5d9c1a20585ae0ca4138f4
Parents: e7f9766
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Jul 5 17:16:50 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Jul 19 16:21:10 2017 -0700
----------------------------------------------------------------------
.../hbase/rsgroup/RSGroupInfoManagerImpl.java | 2 +-
.../hadoop/hbase/rsgroup/TestRSGroupsBase.java | 54 ++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c69283c/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
index 6c991bd..5cb2e71 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
@@ -227,7 +227,7 @@ public class RSGroupInfoManagerImpl implements RSGroupInfoManager, ServerListene
Map<String,RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);
for(TableName tableName: tableNames) {
if (tableMap.containsKey(tableName)) {
- RSGroupInfo src = new RSGroupInfo(rsGroupMap.get(tableMap.get(tableName)));
+ RSGroupInfo src = new RSGroupInfo(newGroupMap.get(tableMap.get(tableName)));
src.removeTable(tableName);
newGroupMap.put(src.getName(), src);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c69283c/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 9225e09..5fcdc7c 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
@@ -640,4 +640,58 @@ public abstract class TestRSGroupsBase {
private String getGroupName(String baseName) {
return groupPrefix+"_"+baseName+"_"+rand.nextInt(Integer.MAX_VALUE);
}
+
+ @Test
+ public void testMultiTableMove() throws Exception {
+ LOG.info("testMultiTableMove");
+
+ final TableName tableNameA = TableName.valueOf(tablePrefix + "_testMultiTableMoveA");
+ final TableName tableNameB = TableName.valueOf(tablePrefix + "_testMultiTableMoveB");
+ final byte[] familyNameBytes = Bytes.toBytes("f");
+ String newGroupName = getGroupName("testMultiTableMove");
+ final RSGroupInfo newGroup = addGroup(rsGroupAdmin, newGroupName, 1);
+
+ TEST_UTIL.createTable(tableNameA, familyNameBytes);
+ TEST_UTIL.createTable(tableNameB, familyNameBytes);
+ TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {
+ @Override
+ public boolean evaluate() throws Exception {
+ List<String> regionsA = getTableRegionMap().get(tableNameA);
+ if (regionsA == null)
+ return false;
+ List<String> regionsB = getTableRegionMap().get(tableNameB);
+ if (regionsB == null)
+ return false;
+
+ return getTableRegionMap().get(tableNameA).size() >= 1
+ && getTableRegionMap().get(tableNameB).size() >= 1;
+ }
+ });
+
+ RSGroupInfo tableGrpA = rsGroupAdmin.getRSGroupInfoOfTable(tableNameA);
+ assertTrue(tableGrpA.getName().equals(RSGroupInfo.DEFAULT_GROUP));
+
+ RSGroupInfo tableGrpB = rsGroupAdmin.getRSGroupInfoOfTable(tableNameB);
+ assertTrue(tableGrpB.getName().equals(RSGroupInfo.DEFAULT_GROUP));
+ //change table's group
+ LOG.info("Moving table [" + tableNameA + "," + tableNameB + "] to " + newGroup.getName());
+ rsGroupAdmin.moveTables(Sets.newHashSet(tableNameA, tableNameB), newGroup.getName());
+
+ //verify group change
+ Assert.assertEquals(newGroup.getName(),
+ rsGroupAdmin.getRSGroupInfoOfTable(tableNameA).getName());
+
+ Assert.assertEquals(newGroup.getName(),
+ rsGroupAdmin.getRSGroupInfoOfTable(tableNameB).getName());
+
+ //verify tables' not exist in old group
+ Set<TableName> DefaultTables = rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP).getTables();
+ assertFalse(DefaultTables.contains(tableNameA));
+ assertFalse(DefaultTables.contains(tableNameB));
+
+ //verify tables' exist in new group
+ Set<TableName> newGroupTables = rsGroupAdmin.getRSGroupInfo(newGroupName).getTables();
+ assertTrue(newGroupTables.contains(tableNameA));
+ assertTrue(newGroupTables.contains(tableNameB));
+ }
}