Index: src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (revision 1335943) +++ src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (working copy) @@ -63,7 +63,8 @@ import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.LeaseManager; import org.apache.log4j.Level; -import org.junit.AfterClass; +import org.junit.After; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -158,19 +159,21 @@ "hbase.regionserver.hlog.tolerable.lowreplication", 2); TEST_UTIL.getConfiguration().setInt( "hbase.regionserver.hlog.lowreplication.rolllimit", 3); - TEST_UTIL.startMiniCluster(2); + } + @Before + public void setUp() throws Exception { + TEST_UTIL.startMiniCluster(2); cluster = TEST_UTIL.getHBaseCluster(); dfsCluster = TEST_UTIL.getDFSCluster(); fs = TEST_UTIL.getTestFileSystem(); admin = TEST_UTIL.getHBaseAdmin(); - // disable region rebalancing (interferes with log watching) cluster.getMaster().balanceSwitch(false); } - @AfterClass - public static void tearDown() throws IOException { + @After + public void tearDown() throws IOException { TEST_UTIL.cleanupTestDir(); TEST_UTIL.shutdownMiniCluster(); } @@ -321,10 +324,6 @@ HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); - if (admin.tableExists(tableName)) { - admin.disableTable(tableName); - admin.deleteTable(tableName); - } admin.createTable(desc); HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName); @@ -410,10 +409,6 @@ HTableDescriptor desc = new HTableDescriptor(tableName); desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); - if (admin.tableExists(tableName)) { - admin.disableTable(tableName); - admin.deleteTable(tableName); - } admin.createTable(desc); HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName);