HBASE-20677 Backport test of HBASE-20566 'Creating a system table after enabling rsgroup feature puts region into RIT' to branch-2
Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
parent
d99ba62b12
commit
832f67d483
|
@ -89,14 +89,16 @@ public class TestRSGroups extends TestRSGroupsBase {
|
|||
RSGroupBasedLoadBalancer.class.getName());
|
||||
TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
|
||||
RSGroupAdminEndpoint.class.getName() + "," + CPMasterObserver.class.getName());
|
||||
// Enable quota for testRSGroupsWithHBaseQuota()
|
||||
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
|
||||
TEST_UTIL.startMiniCluster(NUM_SLAVES_BASE - 1);
|
||||
TEST_UTIL.getConfiguration().setInt(
|
||||
ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
|
||||
NUM_SLAVES_BASE - 1);
|
||||
TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
|
||||
|
||||
initialize();
|
||||
}
|
||||
|
||||
private static void initialize() throws Exception {
|
||||
admin = TEST_UTIL.getAdmin();
|
||||
cluster = TEST_UTIL.getHBaseCluster();
|
||||
master = ((MiniHBaseCluster)cluster).getMaster();
|
||||
|
@ -178,8 +180,8 @@ public class TestRSGroups extends TestRSGroupsBase {
|
|||
assertEquals(4, defaultInfo.getServers().size());
|
||||
// Assignment of root and meta regions.
|
||||
int count = master.getAssignmentManager().getRegionStates().getRegionAssignments().size();
|
||||
//4 meta,namespace, group, quota
|
||||
assertEquals(4, count);
|
||||
//3 meta,namespace, group
|
||||
assertEquals(3, count);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -525,11 +527,27 @@ public class TestRSGroups extends TestRSGroupsBase {
|
|||
|
||||
@Test
|
||||
public void testRSGroupsWithHBaseQuota() throws Exception {
|
||||
TEST_UTIL.waitFor(90000, new Waiter.Predicate<Exception>() {
|
||||
@Override
|
||||
public boolean evaluate() throws Exception {
|
||||
return admin.isTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
|
||||
}
|
||||
});
|
||||
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
|
||||
restartHBaseCluster();
|
||||
try {
|
||||
TEST_UTIL.waitFor(90000, new Waiter.Predicate<Exception>() {
|
||||
@Override
|
||||
public boolean evaluate() throws Exception {
|
||||
return admin.isTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
|
||||
}
|
||||
});
|
||||
} finally {
|
||||
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, false);
|
||||
restartHBaseCluster();
|
||||
}
|
||||
}
|
||||
|
||||
private void restartHBaseCluster() throws Exception {
|
||||
LOG.info("\n\nShutting down cluster");
|
||||
TEST_UTIL.shutdownMiniHBaseCluster();
|
||||
LOG.info("\n\nSleeping a bit");
|
||||
Thread.sleep(2000);
|
||||
TEST_UTIL.restartHBaseCluster(NUM_SLAVES_BASE - 1);
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue