diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index 273fdfa..066b166 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; +import java.util.HashSet; import java.util.Set; import java.util.concurrent.Callable; @@ -117,13 +118,16 @@ public class TestNamespace { //verify existence of system tables Set systemTables = Sets.newHashSet( TableName.META_TABLE_NAME, - TableName.NAMESPACE_TABLE_NAME); + TableName.NAMESPACE_TABLE_NAME, + TableName.BACKUP_TABLE_NAME); HTableDescriptor[] descs = admin.listTableDescriptorsByNamespace(NamespaceDescriptor.SYSTEM_NAMESPACE.getName()); - assertEquals(systemTables.size(), descs.length); + assertTrue(descs.length >= systemTables.size()); + Set tables = new HashSet<>(); for (HTableDescriptor desc : descs) { - assertTrue(systemTables.contains(desc.getTableName())); + tables.add(desc.getTableName()); } + assertTrue(tables.containsAll(systemTables)); //verify system tables aren't listed assertEquals(0, admin.listTables().length); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index 825a7e2..3cdab16 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -1457,14 +1457,14 @@ public class TestDistributedLogSplitting { for (String oregion : regions) LOG.debug("Region still online: " + oregion); } - assertEquals(2 + existingRegions, regions.size()); + assertTrue(2 + existingRegions <= regions.size()); LOG.debug("Enabling table\n"); TEST_UTIL.getHBaseAdmin().enableTable(table); LOG.debug("Waiting for no more RIT\n"); blockUntilNoRIT(zkw, master); LOG.debug("Verifying there are " + numRegions + " assigned on cluster\n"); regions = HBaseTestingUtility.getAllOnlineRegions(cluster); - assertEquals(numRegions + 2 + existingRegions, regions.size()); + assertTrue(numRegions + 2 + existingRegions <= regions.size()); return ht; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java index 33fe65a..7d25e33 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java @@ -232,9 +232,9 @@ public class TestMasterFailover { log("Regions in hbase:meta and namespace have been created"); - // at this point we only expect 4 regions to be assigned out - // (catalogs and namespace, + 2 merging regions) - assertEquals(4, cluster.countServedRegions()); + // at this point we expect at least 4 regions to be assigned out + // (meta and namespace, + 2 merging regions) + assertTrue(4 <= cluster.countServedRegions()); // Move merging regions to the same region server AssignmentManager am = master.getAssignmentManager(); @@ -578,8 +578,8 @@ public class TestMasterFailover { log("Regions in hbase:meta and Namespace have been created"); - // at this point we only expect 2 regions to be assigned out (catalogs and namespace ) - assertEquals(2, cluster.countServedRegions()); + // at this point we expect at least 2 regions to be assigned out (meta and namespace) + assertTrue(2 <= cluster.countServedRegions()); // The first RS will stay online List regionservers = @@ -1224,9 +1224,9 @@ public class TestMasterFailover { log("Regions in hbase:meta and namespace have been created"); - // at this point we only expect 3 regions to be assigned out - // (catalogs and namespace, + 1 online region) - assertEquals(3, cluster.countServedRegions()); + // at this point we expect at least 3 regions to be assigned out + // (meta and namespace, + 1 online region) + assertTrue(3 <= cluster.countServedRegions()); HRegionInfo hriOnline = null; try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(TableName.valueOf("onlineTable"))) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java index a2ecfb4..9c72639 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java @@ -84,9 +84,12 @@ public class TestMasterRestartAfterDisablingTable { TEST_UTIL.getHBaseAdmin().disableTable(table); NavigableSet regions = HBaseTestingUtility.getAllOnlineRegions(cluster); - assertEquals( - "The number of regions for the table tableRestart should be 0 and only" - + "the catalog and namespace tables should be present.", 2, regions.size()); + for (String region : regions) { + assertTrue( + "The number of regions for the table tableRestart should be 0 and only" + + "the catalog and namespace tables should be present.", + !region.startsWith(table.getNameAsString())); + } List masterThreads = cluster.getMasterThreads(); MasterThread activeMaster = null; @@ -115,7 +118,7 @@ public class TestMasterRestartAfterDisablingTable { regions = HBaseTestingUtility.getAllOnlineRegions(cluster); assertEquals("The assigned regions were not onlined after master" + " switch except for the catalog and namespace tables.", - 6, regions.size()); + 7, regions.size()); assertTrue("The table should be in enabled state", cluster.getMaster() .getAssignmentManager().getTableStateManager() .isTableState(TableName.valueOf("tableRestart"), ZooKeeperProtos.Table.State.ENABLED)); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java index 504d98d..6ad1ba0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java @@ -115,7 +115,7 @@ public class TestRestartCluster { List allRegions = MetaScanner.listAllRegions(UTIL.getConfiguration(), connection, true); - assertEquals(4, allRegions.size()); + assertEquals(5, allRegions.size()); LOG.info("\n\nShutting down cluster"); UTIL.shutdownMiniHBaseCluster(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java index 1908edb..eee0034 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java @@ -100,7 +100,7 @@ public class TestRollingRestart { if (regions.size() != 2) { for (String oregion : regions) log("Region still online: " + oregion); } - assertEquals(2, regions.size()); + assertEquals(3, regions.size()); log("Enabling table\n"); TEST_UTIL.getHBaseAdmin().enableTable(table); log("Waiting for no more RIT\n"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java index b732e67..48bc5d8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java @@ -244,7 +244,7 @@ public class TestTablePermissions { Map> allPerms = AccessControlLists.loadAll(conf); assertEquals("Full permission map should have entries for both test tables", - 2, allPerms.size()); + 3, allPerms.size()); userPerms = allPerms.get(TEST_TABLE.getName()).get("hubert"); assertNotNull(userPerms);