From 5de0a5ef7e188c395bab50b3de487973982ca8c3 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Mon, 3 Feb 2020 19:41:49 +0800 Subject: [PATCH] HBASE-23235 Re-enable TestRSGroupsKillRS.testLowerMetaGroupVersion (#1117) Signed-off-by: Guanghao Zhang --- .../org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java index bb4f441304e..d6eaeb2a133 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java @@ -51,7 +51,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -231,9 +230,6 @@ public class TestRSGroupsKillRS extends TestRSGroupsBase { TEST_UTIL.waitTableAvailable(tableName, 30000); } - // TODO: can not change meta group for now as we can not change the table descriptor of meta - // table, this has to be done before we merge back to master. - @Ignore @Test public void testLowerMetaGroupVersion() throws Exception { // create a rsgroup and move one regionserver to it @@ -247,7 +243,6 @@ public class TestRSGroupsKillRS extends TestRSGroupsBase { ADMIN.setRSGroup(toAddTables, groupName); assertTrue(RS_GROUP_ADMIN_CLIENT.getRSGroupInfo(groupName).getTables() .contains(TableName.META_TABLE_NAME)); - TEST_UTIL.waitTableAvailable(tableName, 30000); // restart the regionserver in meta_group, and lower its version String originVersion = "";