http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java index c8a0043..7e142bc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java @@ -59,8 +59,10 @@ import org.apache.hadoop.mapreduce.Mapper.Context; import org.apache.hadoop.util.ToolRunner; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -77,6 +79,9 @@ public class TestWALPlayer { private static FileSystem logFs; private static Configuration conf; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void beforeClass() throws Exception { conf= TEST_UTIL.getConfiguration(); @@ -100,14 +105,14 @@ public class TestWALPlayer { */ @Test public void testWALPlayer() throws Exception { - final TableName TABLENAME1 = TableName.valueOf("testWALPlayer1"); - final TableName TABLENAME2 = TableName.valueOf("testWALPlayer2"); + final TableName tableName1 = TableName.valueOf(name.getMethodName() + "1"); + final TableName tableName2 = TableName.valueOf(name.getMethodName() + "2"); final byte[] FAMILY = Bytes.toBytes("family"); final byte[] COLUMN1 = Bytes.toBytes("c1"); final byte[] COLUMN2 = Bytes.toBytes("c2"); final byte[] ROW = Bytes.toBytes("row"); - Table t1 = TEST_UTIL.createTable(TABLENAME1, FAMILY); - Table t2 = TEST_UTIL.createTable(TABLENAME2, FAMILY); + Table t1 = TEST_UTIL.createTable(tableName1, FAMILY); + Table t2 = TEST_UTIL.createTable(tableName2, FAMILY); // put a row into the first table Put p = new Put(ROW); @@ -132,8 +137,8 @@ public class TestWALPlayer { player.setupTime(configuration, optionName); assertEquals(1000,configuration.getLong(optionName,0)); assertEquals(0, ToolRunner.run(configuration, player, - new String[] {walInputDir, TABLENAME1.getNameAsString(), - TABLENAME2.getNameAsString() })); + new String[] {walInputDir, tableName1.getNameAsString(), + tableName2.getNameAsString() })); // verify the WAL was player into table 2
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java index db72804..5100a2b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java @@ -53,8 +53,10 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.mockito.Mockito; @Category({MasterTests.class, MediumTests.class}) @@ -63,6 +65,9 @@ public class TestAssignmentListener { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + @Rule + public TestName name = new TestName(); + private static final Abortable abortable = new Abortable() { @Override public boolean isAborted() { @@ -213,19 +218,18 @@ public class TestAssignmentListener { DummyAssignmentListener listener = new DummyAssignmentListener(); am.registerListener(listener); try { - final String TABLE_NAME_STR = "testtb"; - final TableName TABLE_NAME = TableName.valueOf(TABLE_NAME_STR); + final TableName tableName = TableName.valueOf(name.getMethodName()); final byte[] FAMILY = Bytes.toBytes("cf"); // Create a new table, with a single region LOG.info("Create Table"); - TEST_UTIL.createTable(TABLE_NAME, FAMILY); + TEST_UTIL.createTable(tableName, FAMILY); listener.awaitModifications(1); assertEquals(1, listener.getLoadCount()); assertEquals(0, listener.getCloseCount()); // Add some data - Table table = TEST_UTIL.getConnection().getTable(TABLE_NAME); + Table table = TEST_UTIL.getConnection().getTable(tableName); try { for (int i = 0; i < 10; ++i) { byte[] key = Bytes.toBytes("row-" + i); @@ -240,7 +244,7 @@ public class TestAssignmentListener { // Split the table in two LOG.info("Split Table"); listener.reset(); - admin.split(TABLE_NAME, Bytes.toBytes("row-3")); + admin.split(tableName, Bytes.toBytes("row-3")); listener.awaitModifications(3); assertEquals(2, listener.getLoadCount()); // daughters added assertEquals(1, listener.getCloseCount()); // parent removed @@ -250,10 +254,10 @@ public class TestAssignmentListener { int mergeable = 0; while (mergeable < 2) { Thread.sleep(100); - admin.majorCompact(TABLE_NAME); + admin.majorCompact(tableName); mergeable = 0; for (JVMClusterUtil.RegionServerThread regionThread: miniCluster.getRegionServerThreads()) { - for (Region region: regionThread.getRegionServer().getOnlineRegions(TABLE_NAME)) { + for (Region region: regionThread.getRegionServer().getOnlineRegions(tableName)) { mergeable += ((HRegion)region).isMergeable() ? 1 : 0; } } @@ -262,9 +266,9 @@ public class TestAssignmentListener { // Merge the two regions LOG.info("Merge Regions"); listener.reset(); - List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME); + List<HRegionInfo> regions = admin.getTableRegions(tableName); assertEquals(2, regions.size()); - boolean sameServer = areAllRegionsLocatedOnSameServer(TABLE_NAME); + boolean sameServer = areAllRegionsLocatedOnSameServer(tableName); // If the regions are located by different server, we need to move // regions to same server before merging. So the expected modifications // will increaes to 5. (open + close) @@ -274,14 +278,14 @@ public class TestAssignmentListener { admin.mergeRegionsAsync(regions.get(0).getEncodedNameAsBytes(), regions.get(1).getEncodedNameAsBytes(), true); listener.awaitModifications(expectedModifications); - assertEquals(1, admin.getTableRegions(TABLE_NAME).size()); + assertEquals(1, admin.getTableRegions(tableName).size()); assertEquals(expectedLoadCount, listener.getLoadCount()); // new merged region added assertEquals(expectedCloseCount, listener.getCloseCount()); // daughters removed // Delete the table LOG.info("Drop Table"); listener.reset(); - TEST_UTIL.deleteTable(TABLE_NAME); + TEST_UTIL.deleteTable(tableName); listener.awaitModifications(1); assertEquals(0, listener.getLoadCount()); assertEquals(1, listener.getCloseCount()); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java index a458b44..fbbebcc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java @@ -36,8 +36,10 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import static org.junit.Assert.fail; @@ -54,6 +56,9 @@ public class TestAssignmentManagerMetrics { private static Configuration conf; private static final int msgInterval = 1000; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void startCluster() throws Exception { LOG.info("Starting cluster"); @@ -91,8 +96,7 @@ public class TestAssignmentManagerMetrics { @Test public void testRITAssignmentManagerMetrics() throws Exception { - - final TableName TABLENAME = TableName.valueOf("testRITMetrics"); + final TableName TABLENAME = TableName.valueOf(name.getMethodName()); final byte[] FAMILY = Bytes.toBytes("family"); Table table = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java index ba88008..97f7865 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java @@ -77,8 +77,10 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; /** * This tests AssignmentManager with a testing cluster. @@ -91,6 +93,9 @@ public class TestAssignmentManagerOnCluster { final static Configuration conf = TEST_UTIL.getConfiguration(); private static Admin admin; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void setUpBeforeClass() throws Exception { // Using the our load balancer to control region plans @@ -179,9 +184,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignRegion() throws Exception { - TableName table = TableName.valueOf("testAssignRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -205,7 +210,7 @@ public class TestAssignmentManagerOnCluster { RegionState newState = regionStates.getRegionState(hri); assertTrue(newState.isOpened()); } finally { - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -214,7 +219,7 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=120000) public void testAssignRegionOnRestartedServer() throws Exception { - TableName table = TableName.valueOf("testAssignRegionOnRestartedServer"); + final TableName tableName = TableName.valueOf(name.getMethodName()); TEST_UTIL.getMiniHBaseCluster().getConf().setInt("hbase.assignment.maximum.attempts", 20); TEST_UTIL.getMiniHBaseCluster().stopMaster(0); //restart the master so that conf take into affect @@ -223,7 +228,7 @@ public class TestAssignmentManagerOnCluster { ServerName deadServer = null; HMaster master = null; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -262,7 +267,7 @@ public class TestAssignmentManagerOnCluster { master.getServerManager().expireServer(deadServer); } - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); // reset the value for other tests TEST_UTIL.getMiniHBaseCluster().getConf().setInt("hbase.assignment.maximum.attempts", 3); @@ -277,10 +282,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testOfflineRegion() throws Exception { - TableName table = - TableName.valueOf("testOfflineRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HRegionInfo hri = createTableAndGetOneRegion(table); + HRegionInfo hri = createTableAndGetOneRegion(tableName); RegionStates regionStates = TEST_UTIL.getHBaseCluster(). getMaster().getAssignmentManager().getRegionStates(); @@ -290,7 +294,7 @@ public class TestAssignmentManagerOnCluster { long timeoutTime = System.currentTimeMillis() + 800; while (true) { - if (regionStates.getRegionByStateOfTable(table) + if (regionStates.getRegionByStateOfTable(tableName) .get(RegionState.State.OFFLINE).contains(hri)) break; long now = System.currentTimeMillis(); @@ -303,7 +307,7 @@ public class TestAssignmentManagerOnCluster { RegionState regionState = regionStates.getRegionState(hri); assertTrue(regionState.isOffline()); } finally { - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -312,10 +316,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=50000) public void testMoveRegion() throws Exception { - TableName table = - TableName.valueOf("testMoveRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HRegionInfo hri = createTableAndGetOneRegion(table); + HRegionInfo hri = createTableAndGetOneRegion(tableName); HMaster master = TEST_UTIL.getHBaseCluster().getMaster(); RegionStates regionStates = master.getAssignmentManager().getRegionStates(); @@ -353,7 +356,7 @@ public class TestAssignmentManagerOnCluster { } } finally { - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -364,11 +367,10 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=50000) public void testMoveRegionOfDeletedTable() throws Exception { - TableName table = - TableName.valueOf("testMoveRegionOfDeletedTable"); + final TableName tableName = TableName.valueOf(name.getMethodName()); Admin admin = TEST_UTIL.getAdmin(); try { - HRegionInfo hri = createTableAndGetOneRegion(table); + HRegionInfo hri = createTableAndGetOneRegion(tableName); HMaster master = TEST_UTIL.getHBaseCluster().getMaster(); AssignmentManager am = master.getAssignmentManager(); @@ -385,7 +387,7 @@ public class TestAssignmentManagerOnCluster { assertTrue(destServerName != null && !destServerName.equals(serverName)); - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); try { admin.move(hri.getEncodedNameAsBytes(), @@ -399,8 +401,8 @@ public class TestAssignmentManagerOnCluster { assertFalse("The region should not be in transition", regionStates.isRegionInTransition(hri)); } finally { - if (admin.tableExists(table)) { - TEST_UTIL.deleteTable(table); + if (admin.tableExists(tableName)) { + TEST_UTIL.deleteTable(tableName); } } } @@ -433,9 +435,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignWhileClosing() throws Exception { - TableName table = TableName.valueOf("testAssignWhileClosing"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -472,7 +474,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 200); } finally { MyRegionObserver.preCloseEnabled.set(false); - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -481,9 +483,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testCloseFailed() throws Exception { - TableName table = TableName.valueOf("testCloseFailed"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -517,7 +519,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnServer(hri, serverName, 200); } finally { MyRegionObserver.preCloseEnabled.set(false); - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -526,9 +528,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testOpenFailed() throws Exception { - TableName table = TableName.valueOf("testOpenFailed"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -556,7 +558,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnServer(hri, serverName, 200); } finally { MyLoadBalancer.controledRegion = null; - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -565,7 +567,7 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testRoundRobinAssignmentFailed() throws Exception { - TableName tableName = TableName.valueOf("testRoundRobinAssignmentFailed"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); @@ -608,7 +610,7 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testRetainAssignmentFailed() throws Exception { - TableName tableName = TableName.valueOf("testRetainAssignmentFailed"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); @@ -661,10 +663,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testOpenFailedUnrecoverable() throws Exception { - TableName table = - TableName.valueOf("testOpenFailedUnrecoverable"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -674,7 +675,7 @@ public class TestAssignmentManagerOnCluster { MetaTableAccessor.addRegionToMeta(meta, hri); FileSystem fs = FileSystem.get(conf); - Path tableDir= FSUtils.getTableDir(FSUtils.getRootDir(conf), table); + Path tableDir= FSUtils.getTableDir(FSUtils.getRootDir(conf), tableName); Path regionDir = new Path(tableDir, hri.getEncodedName()); // create a file named the same as the region dir to // mess up with region opening @@ -699,7 +700,7 @@ public class TestAssignmentManagerOnCluster { getRegionStates().getRegionServerOfRegion(hri); TEST_UTIL.assertRegionOnServer(hri, serverName, 200); } finally { - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -746,9 +747,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testCloseHang() throws Exception { - TableName table = TableName.valueOf("testCloseHang"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -781,7 +782,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnServer(hri, serverName, 200); } finally { MyRegionObserver.postCloseEnabled.set(false); - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -790,9 +791,9 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testOpenCloseRacing() throws Exception { - TableName table = TableName.valueOf("testOpenCloseRacing"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -852,7 +853,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 6000); } finally { MyRegionObserver.postOpenEnabled.set(false); - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -861,11 +862,11 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignRacingWithSSH() throws Exception { - TableName table = TableName.valueOf("testAssignRacingWithSSH"); + final TableName tableName = TableName.valueOf(name.getMethodName()); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); MyMaster master = null; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -929,7 +930,7 @@ public class TestAssignmentManagerOnCluster { if (master != null) { master.enableSSH(true); } - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); cluster.startRegionServer(); } } @@ -939,11 +940,11 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=300000) public void testSSHWaitForServerToAssignRegion() throws Exception { - TableName table = TableName.valueOf("testSSHWaitForServerToAssignRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); boolean startAServer = false; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -951,7 +952,7 @@ public class TestAssignmentManagerOnCluster { final ServerManager serverManager = master.getServerManager(); MyLoadBalancer.countRegionServers = Integer.valueOf( serverManager.countOfRegionServers()); - HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(table); + HRegionServer rs = TEST_UTIL.getRSForFirstRegionInTable(tableName); assertNotNull("First region should be assigned", rs); final ServerName serverName = rs.getServerName(); // Wait till SSH tried to assign regions a several times @@ -974,12 +975,12 @@ public class TestAssignmentManagerOnCluster { }); TEST_UTIL.waitUntilNoRegionsInTransition(300000); - rs = TEST_UTIL.getRSForFirstRegionInTable(table); + rs = TEST_UTIL.getRSForFirstRegionInTable(tableName); assertTrue("First region should be re-assigned to a different server", rs != null && !serverName.equals(rs.getServerName())); } finally { MyLoadBalancer.countRegionServers = null; - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); if (startAServer) { cluster.startRegionServer(); } @@ -991,11 +992,11 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignDisabledRegion() throws Exception { - TableName table = TableName.valueOf("testAssignDisabledRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); MyMaster master = null; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -1011,7 +1012,7 @@ public class TestAssignmentManagerOnCluster { assertTrue(TEST_UTIL.assignRegion(hri)); // Disable the table - admin.disableTable(table); + admin.disableTable(tableName); assertTrue(regionStates.isRegionOffline(hri)); // You can't assign a disabled region @@ -1022,7 +1023,7 @@ public class TestAssignmentManagerOnCluster { am.unassign(hri); assertTrue(regionStates.isRegionOffline(hri)); } finally { - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } @@ -1031,11 +1032,11 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignOfflinedRegionBySSH() throws Exception { - TableName table = TableName.valueOf("testAssignOfflinedRegionBySSH"); + final TableName tableName = TableName.valueOf(name.getMethodName()); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); MyMaster master = null; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -1094,7 +1095,7 @@ public class TestAssignmentManagerOnCluster { TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 200); } finally { MyRegionServer.abortedServer = null; - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); cluster.startRegionServer(); } } @@ -1104,11 +1105,11 @@ public class TestAssignmentManagerOnCluster { */ @Test (timeout=60000) public void testAssignDisabledRegionBySSH() throws Exception { - TableName table = TableName.valueOf("testAssignDisabledRegionBySSH"); + final TableName tableName = TableName.valueOf(name.getMethodName()); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); MyMaster master; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); @@ -1165,7 +1166,7 @@ public class TestAssignmentManagerOnCluster { assertTrue(regionStates.isRegionOffline(hri)); } finally { MyRegionServer.abortedServer = null; - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); cluster.startRegionServer(); } } @@ -1175,10 +1176,10 @@ public class TestAssignmentManagerOnCluster { */ @Test(timeout = 60000) public void testReportRegionStateTransition() throws Exception { - TableName table = TableName.valueOf("testReportRegionStateTransition"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { MyRegionServer.simulateRetry = true; - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(FAMILY)); admin.createTable(desc); Table meta = TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME); @@ -1193,13 +1194,13 @@ public class TestAssignmentManagerOnCluster { // Assert the the region is actually open on the server TEST_UTIL.assertRegionOnServer(hri, serverName, 200); // Closing region should just work fine - admin.disableTable(table); + admin.disableTable(tableName); assertTrue(regionStates.isRegionOffline(hri)); List<HRegionInfo> regions = TEST_UTIL.getAdmin().getOnlineRegions(serverName); assertTrue(!regions.contains(hri)); } finally { MyRegionServer.simulateRetry = false; - TEST_UTIL.deleteTable(table); + TEST_UTIL.deleteTable(tableName); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index ebba4c8..52b58f1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -73,8 +73,10 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileArchiveUtil; import org.apache.hadoop.hbase.util.Triple; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -83,6 +85,9 @@ import org.mockito.stubbing.Answer; public class TestCatalogJanitor { private static final Log LOG = LogFactory.getLog(TestCatalogJanitor.class); + @Rule + public TestName name = new TestName(); + /** * Mock MasterServices for tests below. */ @@ -227,7 +232,7 @@ public class TestCatalogJanitor { try { CatalogJanitor janitor = new CatalogJanitor(services); // Create regions. - HTableDescriptor htd = new HTableDescriptor(TableName.valueOf("table")); + HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName())); htd.addFamily(new HColumnDescriptor("f")); HRegionInfo parent = new HRegionInfo(htd.getTableName(), Bytes.toBytes("aaa"), @@ -555,7 +560,6 @@ public class TestCatalogJanitor { @Test public void testArchiveOldRegion() throws Exception { - String table = "table"; HBaseTestingUtility htu = new HBaseTestingUtility(); setRootDirAndCleanIt(htu, "testCleanParent"); MasterServices services = new MockMasterServices(htu); @@ -564,7 +568,7 @@ public class TestCatalogJanitor { CatalogJanitor janitor = new CatalogJanitor(services); // Create regions. - HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(table)); + HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName())); htd.addFamily(new HColumnDescriptor("f")); HRegionInfo parent = new HRegionInfo(htd.getTableName(), Bytes.toBytes("aaa"), Bytes.toBytes("eee")); @@ -637,7 +641,6 @@ public class TestCatalogJanitor { */ @Test public void testDuplicateHFileResolution() throws Exception { - String table = "table"; HBaseTestingUtility htu = new HBaseTestingUtility(); setRootDirAndCleanIt(htu, "testCleanParent"); MasterServices services = new MockMasterServices(htu); @@ -647,7 +650,7 @@ public class TestCatalogJanitor { CatalogJanitor janitor = new CatalogJanitor(services); // Create regions. - HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(table)); + HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName())); htd.addFamily(new HColumnDescriptor("f")); HRegionInfo parent = new HRegionInfo(htd.getTableName(), Bytes.toBytes("aaa"), Bytes.toBytes("eee")); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java ---------------------------------------------------------------------- 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 ed29010..d59fa06 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 @@ -114,8 +114,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; @Category({MasterTests.class, LargeTests.class}) @SuppressWarnings("deprecation") @@ -144,6 +146,9 @@ public class TestDistributedLogSplitting { static MiniDFSCluster dfsCluster; static MiniZooKeeperCluster zkCluster; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void setup() throws Exception { TEST_UTIL = new HBaseTestingUtility(HBaseConfiguration.create()); @@ -836,8 +841,8 @@ public class TestDistributedLogSplitting { makeWAL(hrs, regions, "table", "family", NUM_LOG_LINES, 100); LOG.info("Disabling table\n"); - TEST_UTIL.getAdmin().disableTable(TableName.valueOf("disableTable")); - TEST_UTIL.waitTableDisabled(TableName.valueOf("disableTable").getName()); + TEST_UTIL.getAdmin().disableTable(TableName.valueOf(name.getMethodName())); + TEST_UTIL.waitTableDisabled(TableName.valueOf(name.getMethodName()).getName()); // abort RS LOG.info("Aborting region server: " + hrs.getServerName()); @@ -875,7 +880,7 @@ public class TestDistributedLogSplitting { int count = 0; FileSystem fs = master.getMasterFileSystem().getFileSystem(); Path rootdir = FSUtils.getRootDir(conf); - Path tdir = FSUtils.getTableDir(rootdir, TableName.valueOf("disableTable")); + Path tdir = FSUtils.getTableDir(rootdir, TableName.valueOf(name.getMethodName())); for (HRegionInfo hri : regions) { Path editsdir = WALSplitter.getRegionDirRecoveredEditsDir( @@ -1256,7 +1261,7 @@ public class TestDistributedLogSplitting { List<RegionServerThread> rsts = cluster.getLiveRegionServerThreads(); final ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "table-creation", null); - Table ht = installTable(zkw, "table", "family", NUM_REGIONS_TO_CREATE); + Table ht = installTable(zkw, name.getMethodName(), "family", NUM_REGIONS_TO_CREATE); try { List<HRegionInfo> regions = null; HRegionServer hrs = null; @@ -1296,7 +1301,7 @@ public class TestDistributedLogSplitting { // use last 5 bytes because HBaseTestingUtility.createMultiRegions use 5 bytes key row = Arrays.copyOfRange(row, 3, 8); long value = 0; - TableName tableName = TableName.valueOf("table"); + TableName tableName = TableName.valueOf(name.getMethodName()); byte[] family = Bytes.toBytes("family"); byte[] qualifier = Bytes.toBytes("c1"); long timeStamp = System.currentTimeMillis(); @@ -1391,7 +1396,7 @@ public class TestDistributedLogSplitting { // use last 5 bytes because HBaseTestingUtility.createMultiRegions use 5 bytes key row = Arrays.copyOfRange(row, 3, 8); long value = 0; - final TableName tableName = TableName.valueOf("table"); + final TableName tableName = TableName.valueOf(name.getMethodName()); byte[] family = Bytes.toBytes("family"); byte[] qualifier = Bytes.toBytes("c1"); long timeStamp = System.currentTimeMillis(); @@ -1446,10 +1451,10 @@ public class TestDistributedLogSplitting { LOG.info("testReadWriteSeqIdFiles"); startCluster(2); final ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "table-creation", null); - Table ht = installTable(zkw, "table", "family", 10); + Table ht = installTable(zkw, name.getMethodName(), "family", 10); try { FileSystem fs = master.getMasterFileSystem().getFileSystem(); - Path tableDir = FSUtils.getTableDir(FSUtils.getRootDir(conf), TableName.valueOf("table")); + Path tableDir = FSUtils.getTableDir(FSUtils.getRootDir(conf), TableName.valueOf(name.getMethodName())); List<Path> regionDirs = FSUtils.getRegionDirs(fs, tableDir); long newSeqId = WALSplitter.writeRegionSequenceIdFile(fs, regionDirs.get(0), 1L, 1000L); WALSplitter.writeRegionSequenceIdFile(fs, regionDirs.get(0) , 1L, 1000L); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java index 36784de..eb4ce99 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java @@ -49,10 +49,12 @@ import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.util.StringUtils; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import com.google.common.base.Joiner; +import org.junit.rules.TestName; @Category({MasterTests.class, MediumTests.class}) public class TestMaster { @@ -63,6 +65,9 @@ public class TestMaster { private static final byte[] FAMILYNAME = Bytes.toBytes("fam"); private static Admin admin; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void beforeAllTests() throws Exception { // we will retry operations when PleaseHoldException is thrown @@ -140,8 +145,7 @@ public class TestMaster { @Test public void testMoveThrowsUnknownRegionException() throws IOException { - TableName tableName = - TableName.valueOf("testMoveThrowsUnknownRegionException"); + final TableName tableName = TableName.valueOf(name.getMethodName()); HTableDescriptor htd = new HTableDescriptor(tableName); HColumnDescriptor hcd = new HColumnDescriptor("value"); htd.addFamily(hcd); @@ -161,7 +165,7 @@ public class TestMaster { @Test public void testMoveThrowsPleaseHoldException() throws IOException { - TableName tableName = TableName.valueOf("testMoveThrowsPleaseHoldException"); + final TableName tableName = TableName.valueOf(name.getMethodName()); HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster(); HTableDescriptor htd = new HTableDescriptor(tableName); HColumnDescriptor hcd = new HColumnDescriptor("value"); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java index 2e83c56..37e714e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java @@ -66,6 +66,7 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.junit.rules.TestRule; import org.mockito.Mockito; @@ -84,6 +85,9 @@ public class TestMasterNoCluster { @Rule public final TestRule timeout = CategoryBasedTimeout.builder(). withTimeout(this.getClass()).withLookingForStuckThread(true).build(); + @Rule + public TestName name = new TestName(); + @BeforeClass public static void setUpBeforeClass() throws Exception { Configuration c = TESTUTIL.getConfiguration(); @@ -163,7 +167,7 @@ public class TestMasterNoCluster { // Put data into sn2 so it looks like it has a few regions for a table named 't'. MetaTableLocator.setMetaLocation(rs0.getZooKeeper(), rs0.getServerName(), RegionState.State.OPEN); - final TableName tableName = TableName.valueOf("t"); + final TableName tableName = TableName.valueOf(name.getMethodName()); Result [] results = new Result [] { MetaMockingUtil.getMetaTableRowResult( new HRegionInfo(tableName, HConstants.EMPTY_START_ROW, HBaseTestingUtility.KEYS[1]), http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java index 7a4baf3..bb8a995 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java @@ -55,8 +55,10 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; @Category({MasterTests.class, MediumTests.class}) public class TestMasterOperationsForRegionReplicas { @@ -67,6 +69,9 @@ public class TestMasterOperationsForRegionReplicas { private static int numSlaves = 2; private static Configuration conf; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void setupBeforeClass() throws Exception { conf = TEST_UTIL.getConfiguration(); @@ -90,37 +95,37 @@ public class TestMasterOperationsForRegionReplicas { public void testCreateTableWithSingleReplica() throws Exception { final int numRegions = 3; final int numReplica = 1; - final TableName table = TableName.valueOf("singleReplicaTable"); + final TableName tableName = TableName.valueOf(name.getMethodName()); try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.setRegionReplication(numReplica); desc.addFamily(new HColumnDescriptor("family")); ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions); - validateNumberOfRowsInMeta(table, numRegions, ADMIN.getConnection()); + validateNumberOfRowsInMeta(tableName, numRegions, ADMIN.getConnection()); List<HRegionInfo> hris = MetaTableAccessor.getTableRegions( - ADMIN.getConnection(), table); + ADMIN.getConnection(), tableName); assert(hris.size() == numRegions * numReplica); } finally { - ADMIN.disableTable(table); - ADMIN.deleteTable(table); + ADMIN.disableTable(tableName); + ADMIN.deleteTable(tableName); } } @Test public void testCreateTableWithMultipleReplicas() throws Exception { - final TableName table = TableName.valueOf("fooTable"); + final TableName tableName = TableName.valueOf(name.getMethodName()); final int numRegions = 3; final int numReplica = 2; try { - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.setRegionReplication(numReplica); desc.addFamily(new HColumnDescriptor("family")); ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions); - TEST_UTIL.waitTableEnabled(table); - validateNumberOfRowsInMeta(table, numRegions, ADMIN.getConnection()); + TEST_UTIL.waitTableEnabled(tableName); + validateNumberOfRowsInMeta(tableName, numRegions, ADMIN.getConnection()); - List<HRegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), table); + List<HRegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName); assert(hris.size() == numRegions * numReplica); // check that the master created expected number of RegionState objects for (int i = 0; i < numRegions; i++) { @@ -137,7 +142,7 @@ public class TestMasterOperationsForRegionReplicas { for (Result result : metaRows) { RegionLocations locations = MetaTableAccessor.getRegionLocations(result); HRegionInfo hri = locations.getRegionLocation().getRegionInfo(); - if (!hri.getTable().equals(table)) continue; + if (!hri.getTable().equals(tableName)) continue; numRows += 1; HRegionLocation[] servers = locations.getRegionLocations(); // have two locations for the replicas of a region, and the locations should be different @@ -148,7 +153,7 @@ public class TestMasterOperationsForRegionReplicas { // The same verification of the meta as above but with the SnapshotOfRegionAssignmentFromMeta // class - validateFromSnapshotFromMeta(TEST_UTIL, table, numRegions, numReplica, + validateFromSnapshotFromMeta(TEST_UTIL, tableName, numRegions, numReplica, ADMIN.getConnection()); // Now kill the master, restart it and see if the assignments are kept @@ -165,7 +170,7 @@ public class TestMasterOperationsForRegionReplicas { assert (state != null); } } - validateFromSnapshotFromMeta(TEST_UTIL, table, numRegions, numReplica, + validateFromSnapshotFromMeta(TEST_UTIL, tableName, numRegions, numReplica, ADMIN.getConnection()); // Now shut the whole cluster down, and verify the assignments are kept so that the @@ -173,43 +178,43 @@ public class TestMasterOperationsForRegionReplicas { TEST_UTIL.getConfiguration().setBoolean("hbase.master.startup.retainassign", true); TEST_UTIL.shutdownMiniHBaseCluster(); TEST_UTIL.startMiniHBaseCluster(1, numSlaves); - TEST_UTIL.waitTableEnabled(table); - validateFromSnapshotFromMeta(TEST_UTIL, table, numRegions, numReplica, + TEST_UTIL.waitTableEnabled(tableName); + validateFromSnapshotFromMeta(TEST_UTIL, tableName, numRegions, numReplica, ADMIN.getConnection()); // Now shut the whole cluster down, and verify regions are assigned even if there is only // one server running TEST_UTIL.shutdownMiniHBaseCluster(); TEST_UTIL.startMiniHBaseCluster(1, 1); - TEST_UTIL.waitTableEnabled(table); + TEST_UTIL.waitTableEnabled(tableName); validateSingleRegionServerAssignment(ADMIN.getConnection(), numRegions, numReplica); for (int i = 1; i < numSlaves; i++) { //restore the cluster TEST_UTIL.getMiniHBaseCluster().startRegionServer(); } //check on alter table - ADMIN.disableTable(table); - assert(ADMIN.isTableDisabled(table)); + ADMIN.disableTable(tableName); + assert(ADMIN.isTableDisabled(tableName)); //increase the replica desc.setRegionReplication(numReplica + 1); - ADMIN.modifyTable(table, desc); - ADMIN.enableTable(table); - assert(ADMIN.isTableEnabled(table)); + ADMIN.modifyTable(tableName, desc); + ADMIN.enableTable(tableName); + assert(ADMIN.isTableEnabled(tableName)); List<HRegionInfo> regions = TEST_UTIL.getMiniHBaseCluster().getMaster() - .getAssignmentManager().getRegionStates().getRegionsOfTable(table); + .getAssignmentManager().getRegionStates().getRegionsOfTable(tableName); assert(regions.size() == numRegions * (numReplica + 1)); //decrease the replica(earlier, table was modified to have a replica count of numReplica + 1) - ADMIN.disableTable(table); + ADMIN.disableTable(tableName); desc.setRegionReplication(numReplica); - ADMIN.modifyTable(table, desc); - ADMIN.enableTable(table); - assert(ADMIN.isTableEnabled(table)); + ADMIN.modifyTable(tableName, desc); + ADMIN.enableTable(tableName); + assert(ADMIN.isTableEnabled(tableName)); regions = TEST_UTIL.getMiniHBaseCluster().getMaster() - .getAssignmentManager().getRegionStates().getRegionsOfTable(table); + .getAssignmentManager().getRegionStates().getRegionsOfTable(tableName); assert(regions.size() == numRegions * numReplica); //also make sure the meta table has the replica locations removed - hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), table); + hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName); assert(hris.size() == numRegions * numReplica); //just check that the number of default replica regions in the meta table are the same //as the number of regions the table was created with, and the count of the @@ -225,30 +230,30 @@ public class TestMasterOperationsForRegionReplicas { Collection<Integer> counts = new HashSet<Integer>(defaultReplicas.values()); assert(counts.size() == 1 && counts.contains(new Integer(numReplica))); } finally { - ADMIN.disableTable(table); - ADMIN.deleteTable(table); + ADMIN.disableTable(tableName); + ADMIN.deleteTable(tableName); } } //@Test (TODO: enable when we have support for alter_table- HBASE-10361). public void testIncompleteMetaTableReplicaInformation() throws Exception { - final TableName table = TableName.valueOf("fooTableTest1"); + final TableName tableName = TableName.valueOf(name.getMethodName()); final int numRegions = 3; final int numReplica = 2; try { // Create a table and let the meta table be updated with the location of the // region locations. - HTableDescriptor desc = new HTableDescriptor(table); + HTableDescriptor desc = new HTableDescriptor(tableName); desc.setRegionReplication(numReplica); desc.addFamily(new HColumnDescriptor("family")); ADMIN.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), numRegions); - TEST_UTIL.waitTableEnabled(table); + TEST_UTIL.waitTableEnabled(tableName); Set<byte[]> tableRows = new HashSet<byte[]>(); - List<HRegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), table); + List<HRegionInfo> hris = MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName); for (HRegionInfo hri : hris) { tableRows.add(hri.getRegionName()); } - ADMIN.disableTable(table); + ADMIN.disableTable(tableName); // now delete one replica info from all the rows // this is to make the meta appear to be only partially updated Table metaTable = ADMIN.getConnection().getTable(TableName.META_TABLE_NAME); @@ -265,14 +270,14 @@ public class TestMasterOperationsForRegionReplicas { metaTable.close(); // even if the meta table is partly updated, when we re-enable the table, we should // get back the desired number of replicas for the regions - ADMIN.enableTable(table); - assert(ADMIN.isTableEnabled(table)); + ADMIN.enableTable(tableName); + assert(ADMIN.isTableEnabled(tableName)); List<HRegionInfo> regions = TEST_UTIL.getMiniHBaseCluster().getMaster() - .getAssignmentManager().getRegionStates().getRegionsOfTable(table); + .getAssignmentManager().getRegionStates().getRegionsOfTable(tableName); assert(regions.size() == numRegions * numReplica); } finally { - ADMIN.disableTable(table); - ADMIN.deleteTable(table); + ADMIN.disableTable(tableName); + ADMIN.deleteTable(tableName); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java ---------------------------------------------------------------------- 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 d23c6f9..fc49c44 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 @@ -39,14 +39,19 @@ import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; @Category({MasterTests.class, LargeTests.class}) public class TestMasterRestartAfterDisablingTable { private static final Log LOG = LogFactory.getLog(TestMasterRestartAfterDisablingTable.class); + @Rule + public TestName name = new TestName(); + @Test public void testForCheckingIfEnableAndDisableWorksFineAfterSwitch() throws Exception { @@ -64,19 +69,19 @@ public class TestMasterRestartAfterDisablingTable { cluster.waitForActiveAndReadyMaster(); // Create a table with regions - TableName table = TableName.valueOf("tableRestart"); + final TableName tableName = TableName.valueOf(name.getMethodName()); byte[] family = Bytes.toBytes("family"); log("Creating table with " + NUM_REGIONS_TO_CREATE + " regions"); - Table ht = TEST_UTIL.createMultiRegionTable(table, family, NUM_REGIONS_TO_CREATE); + Table ht = TEST_UTIL.createMultiRegionTable(tableName, family, NUM_REGIONS_TO_CREATE); int numRegions = -1; - try (RegionLocator r = TEST_UTIL.getConnection().getRegionLocator(table)) { + try (RegionLocator r = TEST_UTIL.getConnection().getRegionLocator(tableName)) { numRegions = r.getStartKeys().length; } numRegions += 1; // catalogs log("Waiting for no more RIT\n"); TEST_UTIL.waitUntilNoRegionsInTransition(60000); log("Disabling table\n"); - TEST_UTIL.getAdmin().disableTable(table); + TEST_UTIL.getAdmin().disableTable(tableName); NavigableSet<String> regions = HBaseTestingUtility.getAllOnlineRegions(cluster); assertEquals( @@ -97,12 +102,12 @@ public class TestMasterRestartAfterDisablingTable { assertTrue("The table should not be in enabled state", cluster.getMaster().getTableStateManager().isTableState( - TableName.valueOf("tableRestart"), TableState.State.DISABLED, + TableName.valueOf(name.getMethodName()), TableState.State.DISABLED, TableState.State.DISABLING)); log("Enabling table\n"); // Need a new Admin, the previous one is on the old master Admin admin = TEST_UTIL.getAdmin(); - admin.enableTable(table); + admin.enableTable(tableName); admin.close(); log("Waiting for no more RIT\n"); TEST_UTIL.waitUntilNoRegionsInTransition(60000); @@ -113,7 +118,7 @@ public class TestMasterRestartAfterDisablingTable { 6, regions.size()); assertTrue("The table should be in enabled state", cluster.getMaster().getTableStateManager() - .isTableState(TableName.valueOf("tableRestart"), TableState.State.ENABLED)); + .isTableState(TableName.valueOf(name.getMethodName()), TableState.State.ENABLED)); ht.close(); TEST_UTIL.shutdownMiniCluster(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java index 2b289ec..7c6f08b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java @@ -42,8 +42,10 @@ import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; @Category({MasterTests.class, MediumTests.class}) public class TestRegionPlacement2 { @@ -54,6 +56,9 @@ public class TestRegionPlacement2 { private final static int SECONDARY = Position.SECONDARY.ordinal(); private final static int TERTIARY = Position.TERTIARY.ordinal(); + @Rule + public TestName name = new TestName(); + @BeforeClass public static void setupBeforeClass() throws Exception { Configuration conf = TEST_UTIL.getConfiguration(); @@ -80,7 +85,7 @@ public class TestRegionPlacement2 { servers.add(server); } List<HRegionInfo> regions = new ArrayList<HRegionInfo>(1); - HRegionInfo region = new HRegionInfo(TableName.valueOf("foobar")); + HRegionInfo region = new HRegionInfo(TableName.valueOf(name.getMethodName())); regions.add(region); Map<ServerName,List<HRegionInfo>> assignmentMap = balancer.roundRobinAssignment(regions, servers); @@ -141,7 +146,7 @@ public class TestRegionPlacement2 { servers.add(server); } List<HRegionInfo> regions = new ArrayList<HRegionInfo>(1); - HRegionInfo region = new HRegionInfo(TableName.valueOf("foobar")); + HRegionInfo region = new HRegionInfo(TableName.valueOf(name.getMethodName())); regions.add(region); ServerName serverBefore = balancer.randomAssignment(region, servers); List<ServerName> favoredNodesBefore = http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java index 388924b..8d20179 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java @@ -25,14 +25,19 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; @Category({MasterTests.class, SmallTests.class}) public class TestRegionPlan { + @Rule + public TestName name = new TestName(); + @Test public void test() { - HRegionInfo hri = new HRegionInfo(TableName.valueOf("table")); + HRegionInfo hri = new HRegionInfo(TableName.valueOf(name.getMethodName())); ServerName source = ServerName.valueOf("source", 1234, 2345); ServerName dest = ServerName.valueOf("dest", 1234, 2345); @@ -46,7 +51,7 @@ public class TestRegionPlan { assertEquals(plan, new RegionPlan(hri, dest, source)); // HRI is used for equality - HRegionInfo other = new HRegionInfo(TableName.valueOf("other")); + HRegionInfo other = new HRegionInfo(TableName.valueOf(name.getMethodName() + "other")); assertNotEquals(plan.hashCode(), new RegionPlan(other, source, dest).hashCode()); assertNotEquals(plan, new RegionPlan(other, source, dest)); } http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java index 494835f..daf6d43 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java @@ -22,17 +22,22 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import static org.junit.Assert.assertEquals; @Category({MasterTests.class, SmallTests.class}) public class TestRegionState { + @Rule + public TestName name = new TestName(); + @Test public void test() { RegionState state1 = new RegionState( - new HRegionInfo(TableName.valueOf("table")), RegionState.State.OPENING); + new HRegionInfo(TableName.valueOf(name.getMethodName())), RegionState.State.OPENING); ClusterStatusProtos.RegionState protobuf1 = state1.convert(); RegionState state2 = RegionState.convert(protobuf1); ClusterStatusProtos.RegionState protobuf2 = state1.convert(); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java ---------------------------------------------------------------------- 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 900d3d3..ac99b29 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 @@ -43,8 +43,10 @@ import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; /** * Tests the restarting of everything as done during rolling restarts. @@ -53,6 +55,9 @@ import org.junit.experimental.categories.Category; public class TestRollingRestart { private static final Log LOG = LogFactory.getLog(TestRollingRestart.class); + @Rule + public TestName name = new TestName(); + @Test (timeout=500000) public void testBasicRollingRestart() throws Exception { @@ -73,19 +78,19 @@ public class TestRollingRestart { cluster.waitForActiveAndReadyMaster(); // Create a table with regions - TableName table = TableName.valueOf("tableRestart"); + final TableName tableName = TableName.valueOf(name.getMethodName()); byte [] family = Bytes.toBytes("family"); log("Creating table with " + NUM_REGIONS_TO_CREATE + " regions"); - Table ht = TEST_UTIL.createMultiRegionTable(table, family, NUM_REGIONS_TO_CREATE); + Table ht = TEST_UTIL.createMultiRegionTable(tableName, family, NUM_REGIONS_TO_CREATE); int numRegions = -1; - try (RegionLocator r = TEST_UTIL.getConnection().getRegionLocator(table)) { + try (RegionLocator r = TEST_UTIL.getConnection().getRegionLocator(tableName)) { numRegions = r.getStartKeys().length; } numRegions += 1; // catalogs log("Waiting for no more RIT\n"); TEST_UTIL.waitUntilNoRegionsInTransition(60000); log("Disabling table\n"); - TEST_UTIL.getAdmin().disableTable(table); + TEST_UTIL.getAdmin().disableTable(tableName); log("Waiting for no more RIT\n"); TEST_UTIL.waitUntilNoRegionsInTransition(60000); NavigableSet<String> regions = HBaseTestingUtility.getAllOnlineRegions(cluster); @@ -95,7 +100,7 @@ public class TestRollingRestart { } assertEquals(2, regions.size()); log("Enabling table\n"); - TEST_UTIL.getAdmin().enableTable(table); + TEST_UTIL.getAdmin().enableTable(tableName); log("Waiting for no more RIT\n"); TEST_UTIL.waitUntilNoRegionsInTransition(60000); log("Verifying there are " + numRegions + " assigned on cluster\n"); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java index e6ce394..37def1b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableStateManager.java @@ -33,8 +33,10 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; import org.junit.After; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; /** * Tests the default table lock manager @@ -44,6 +46,9 @@ public class TestTableStateManager { private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + @Rule + public TestName name = new TestName(); + @After public void tearDown() throws Exception { TEST_UTIL.shutdownMiniCluster(); @@ -51,8 +56,7 @@ public class TestTableStateManager { @Test(timeout = 60000) public void testUpgradeFromZk() throws Exception { - TableName tableName = - TableName.valueOf("testUpgradeFromZk"); + final TableName tableName = TableName.valueOf(name.getMethodName()); TEST_UTIL.startMiniCluster(2, 1); TEST_UTIL.shutdownMiniHBaseCluster(); ZooKeeperWatcher watcher = TEST_UTIL.getZooKeeperWatcher(); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java index 9e3bb17..554fec5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java @@ -51,8 +51,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.mockito.Mockito; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -74,6 +76,9 @@ public class TestBaseLoadBalancer extends BalancerTestBase { new int[] { 1, 3 }, new int[] { 2, 3 }, new int[] { 3, 3 }, new int[] { 25, 3 }, new int[] { 2, 10 }, new int[] { 2, 100 }, new int[] { 12, 10 }, new int[] { 12, 100 }, }; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void beforeAllTests() throws Exception { Configuration conf = HBaseConfiguration.create(); @@ -244,7 +249,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { Mockito.when(services.getServerManager()).thenReturn(sm); balancer.setMasterServices(services); HRegionInfo hri1 = new HRegionInfo( - TableName.valueOf("table"), "key1".getBytes(), "key2".getBytes(), + TableName.valueOf(name.getMethodName()), "key1".getBytes(), "key2".getBytes(), false, 100); assertNull(balancer.randomAssignment(hri1, Collections.EMPTY_LIST)); assertNull(balancer.randomAssignment(hri1, null)); @@ -266,13 +271,13 @@ public class TestBaseLoadBalancer extends BalancerTestBase { List<HRegionInfo> list2 = new ArrayList<HRegionInfo>(); // create a region (region1) HRegionInfo hri1 = new HRegionInfo( - TableName.valueOf("table"), "key1".getBytes(), "key2".getBytes(), + TableName.valueOf(name.getMethodName()), "key1".getBytes(), "key2".getBytes(), false, 100); // create a replica of the region (replica_of_region1) HRegionInfo hri2 = RegionReplicaUtil.getRegionInfoForReplica(hri1, 1); // create a second region (region2) HRegionInfo hri3 = new HRegionInfo( - TableName.valueOf("table"), "key2".getBytes(), "key3".getBytes(), + TableName.valueOf(name.getMethodName()), "key2".getBytes(), "key3".getBytes(), false, 101); list0.add(hri1); //only region1 list1.add(hri2); //only replica_of_region1 @@ -335,13 +340,13 @@ public class TestBaseLoadBalancer extends BalancerTestBase { List<HRegionInfo> list2 = new ArrayList<HRegionInfo>(); // create a region (region1) HRegionInfo hri1 = new HRegionInfo( - TableName.valueOf("table"), "key1".getBytes(), "key2".getBytes(), + TableName.valueOf(name.getMethodName()), "key1".getBytes(), "key2".getBytes(), false, 100); // create a replica of the region (replica_of_region1) HRegionInfo hri2 = RegionReplicaUtil.getRegionInfoForReplica(hri1, 1); // create a second region (region2) HRegionInfo hri3 = new HRegionInfo( - TableName.valueOf("table"), "key2".getBytes(), "key3".getBytes(), + TableName.valueOf(name.getMethodName()), "key2".getBytes(), "key3".getBytes(), false, 101); list0.add(hri1); //only region1 list1.add(hri2); //only replica_of_region1 http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java index dcf78ff..962daf7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java @@ -38,8 +38,10 @@ import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.net.DNSToSwitchMapping; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -114,6 +116,8 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { int [] mockUniformCluster = new int[] { 5, 5, 5, 5, 5 ,0}; + @Rule + public TestName name = new TestName(); /** * Test the load balancing algorithm. @@ -130,7 +134,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { for (int[] mockCluster : clusterStateMocks) { Map<ServerName, List<HRegionInfo>> clusterServers = mockClusterServers(mockCluster, 50); List<ServerAndLoad> clusterList = convertToList(clusterServers); - clusterLoad.put(TableName.valueOf("ensemble"), clusterServers); + clusterLoad.put(TableName.valueOf(name.getMethodName()), clusterServers); HashMap<TableName, TreeMap<ServerName, List<HRegionInfo>>> result = mockClusterServersWithTables(clusterServers); loadBalancer.setClusterLoad(clusterLoad); List<RegionPlan> clusterplans = new ArrayList<RegionPlan>(); @@ -168,7 +172,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { = new TreeMap<TableName, Map<ServerName, List<HRegionInfo>>>(); Map<ServerName, List<HRegionInfo>> clusterServers = mockUniformClusterServers(mockUniformCluster); List<ServerAndLoad> clusterList = convertToList(clusterServers); - clusterLoad.put(TableName.valueOf("ensemble"), clusterServers); + clusterLoad.put(TableName.valueOf(name.getMethodName()), clusterServers); // use overall can achieve both table and cluster level balance HashMap<TableName, TreeMap<ServerName, List<HRegionInfo>>> result1 = mockClusterServersWithTables(clusterServers); loadBalancer.setClusterLoad(clusterLoad); http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java index 0401ae8..df4ed3e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.junit.rules.TestRule; /** @@ -59,6 +60,9 @@ public class TestHFileLinkCleaner { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + @Rule + public TestName name = new TestName(); + @Test public void testHFileLinkCleaning() throws Exception { Configuration conf = TEST_UTIL.getConfiguration(); @@ -67,8 +71,8 @@ public class TestHFileLinkCleaner { Path rootDir = FSUtils.getRootDir(conf); FileSystem fs = FileSystem.get(conf); - final TableName tableName = TableName.valueOf("test-table"); - final TableName tableLinkName = TableName.valueOf("test-link"); + final TableName tableName = TableName.valueOf(name.getMethodName()); + final TableName tableLinkName = TableName.valueOf(name.getMethodName() + "-link"); final String hfileName = "1234567890"; final String familyName = "cf"; http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java index 05d0447..e25a61f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java @@ -46,8 +46,10 @@ import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; import org.mockito.Mockito; /** @@ -63,6 +65,9 @@ public class TestSimpleRegionNormalizer { private static MasterServices masterServices; private static MasterRpcServices masterRpcServices; + @Rule + public TestName name = new TestName(); + @BeforeClass public static void beforeAllTests() throws Exception { normalizer = new SimpleRegionNormalizer(); @@ -81,78 +86,78 @@ public class TestSimpleRegionNormalizer { @Test public void testNoNormalizationIfTooFewRegions() throws HBaseIOException { - TableName testTable = TableName.valueOf("testSplitOfSmallRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 10); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 15); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); assertTrue(plans == null); } @Test public void testNoNormalizationOnNormalizedCluster() throws HBaseIOException { - TableName testTable = TableName.valueOf("testSplitOfSmallRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 10); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 15); - HRegionInfo hri3 = new HRegionInfo(testTable, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); + HRegionInfo hri3 = new HRegionInfo(tableName, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); hris.add(hri3); regionSizes.put(hri3.getRegionName(), 8); - HRegionInfo hri4 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri4 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri4.getRegionName(), 10); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); assertTrue(plans == null); } @Test public void testMergeOfSmallRegions() throws HBaseIOException { - TableName testTable = TableName.valueOf("testMergeOfSmallRegions"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 15); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 5); - HRegionInfo hri3 = new HRegionInfo(testTable, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); + HRegionInfo hri3 = new HRegionInfo(tableName, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); hris.add(hri3); regionSizes.put(hri3.getRegionName(), 5); - HRegionInfo hri4 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri4 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri4.getRegionName(), 15); - HRegionInfo hri5 = new HRegionInfo(testTable, Bytes.toBytes("eee"), Bytes.toBytes("fff")); + HRegionInfo hri5 = new HRegionInfo(tableName, Bytes.toBytes("eee"), Bytes.toBytes("fff")); hris.add(hri5); regionSizes.put(hri5.getRegionName(), 16); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); NormalizationPlan plan = plans.get(0); assertTrue(plan instanceof MergeNormalizationPlan); @@ -163,36 +168,36 @@ public class TestSimpleRegionNormalizer { // Test for situation illustrated in HBASE-14867 @Test public void testMergeOfSecondSmallestRegions() throws HBaseIOException { - TableName testTable = TableName.valueOf("testMergeOfSmallRegions"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 1); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 10000); - HRegionInfo hri3 = new HRegionInfo(testTable, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); + HRegionInfo hri3 = new HRegionInfo(tableName, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); hris.add(hri3); regionSizes.put(hri3.getRegionName(), 10000); - HRegionInfo hri4 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri4 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri4.getRegionName(), 10000); - HRegionInfo hri5 = new HRegionInfo(testTable, Bytes.toBytes("eee"), Bytes.toBytes("fff")); + HRegionInfo hri5 = new HRegionInfo(tableName, Bytes.toBytes("eee"), Bytes.toBytes("fff")); hris.add(hri5); regionSizes.put(hri5.getRegionName(), 2700); - HRegionInfo hri6 = new HRegionInfo(testTable, Bytes.toBytes("fff"), Bytes.toBytes("ggg")); + HRegionInfo hri6 = new HRegionInfo(tableName, Bytes.toBytes("fff"), Bytes.toBytes("ggg")); hris.add(hri6); regionSizes.put(hri6.getRegionName(), 2700); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); NormalizationPlan plan = plans.get(0); assertTrue(plan instanceof MergeNormalizationPlan); @@ -202,60 +207,60 @@ public class TestSimpleRegionNormalizer { @Test public void testMergeOfSmallNonAdjacentRegions() throws HBaseIOException { - TableName testTable = TableName.valueOf("testMergeOfSmallRegions"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 15); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 5); - HRegionInfo hri3 = new HRegionInfo(testTable, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); + HRegionInfo hri3 = new HRegionInfo(tableName, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); hris.add(hri3); regionSizes.put(hri3.getRegionName(), 16); - HRegionInfo hri4 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri4 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri4.getRegionName(), 15); - HRegionInfo hri5 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri5 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri5.getRegionName(), 5); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); assertTrue(plans == null); } @Test public void testSplitOfLargeRegion() throws HBaseIOException { - TableName testTable = TableName.valueOf("testSplitOfLargeRegion"); + final TableName tableName = TableName.valueOf(name.getMethodName()); List<HRegionInfo> hris = new ArrayList<>(); Map<byte[], Integer> regionSizes = new HashMap<>(); - HRegionInfo hri1 = new HRegionInfo(testTable, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); + HRegionInfo hri1 = new HRegionInfo(tableName, Bytes.toBytes("aaa"), Bytes.toBytes("bbb")); hris.add(hri1); regionSizes.put(hri1.getRegionName(), 8); - HRegionInfo hri2 = new HRegionInfo(testTable, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); + HRegionInfo hri2 = new HRegionInfo(tableName, Bytes.toBytes("bbb"), Bytes.toBytes("ccc")); hris.add(hri2); regionSizes.put(hri2.getRegionName(), 6); - HRegionInfo hri3 = new HRegionInfo(testTable, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); + HRegionInfo hri3 = new HRegionInfo(tableName, Bytes.toBytes("ccc"), Bytes.toBytes("ddd")); hris.add(hri3); regionSizes.put(hri3.getRegionName(), 10); - HRegionInfo hri4 = new HRegionInfo(testTable, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); + HRegionInfo hri4 = new HRegionInfo(tableName, Bytes.toBytes("ddd"), Bytes.toBytes("eee")); hris.add(hri4); regionSizes.put(hri4.getRegionName(), 30); setupMocksForNormalizer(regionSizes, hris); - List<NormalizationPlan> plans = normalizer.computePlanForTable(testTable); + List<NormalizationPlan> plans = normalizer.computePlanForTable(tableName); NormalizationPlan plan = plans.get(0); assertTrue(plan instanceof SplitNormalizationPlan);
