You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/02/13 21:29:13 UTC
[04/10] hbase git commit: HBASE-9702 Changed unit tests to use method
names for tables
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
index ed28a0b..19df42a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
@@ -43,8 +43,10 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator;
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 java.io.IOException;
import java.util.Collections;
@@ -63,6 +65,9 @@ public class TestSimpleRegionNormalizerOnCluster {
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
@@ -97,9 +102,9 @@ public class TestSimpleRegionNormalizerOnCluster {
.addConfiguration(TableNamespaceManager.KEY_MAX_TABLES, "2").build();
admin.createNamespace(nspDesc);
TABLENAME = TableName.valueOf(nsp +
- TableName.NAMESPACE_DELIM + "testRegionNormalizationSplitOnCluster");
+ TableName.NAMESPACE_DELIM + name.getMethodName());
} else {
- TABLENAME = TableName.valueOf("testRegionNormalizationSplitOnCluster");
+ TABLENAME = TableName.valueOf(name.getMethodName());
}
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
@@ -176,15 +181,14 @@ public class TestSimpleRegionNormalizerOnCluster {
@Test(timeout = 60000)
@SuppressWarnings("deprecation")
public void testRegionNormalizationMergeOnCluster() throws Exception {
- final TableName TABLENAME =
- TableName.valueOf("testRegionNormalizationMergeOnCluster");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
// create 5 regions with sizes to trigger merge of small regions
- try (Table ht = TEST_UTIL.createMultiRegionTable(TABLENAME, FAMILYNAME, 5)) {
+ try (Table ht = TEST_UTIL.createMultiRegionTable(tableName, FAMILYNAME, 5)) {
// Need to get sorted list of regions here
- List<HRegion> generatedRegions = TEST_UTIL.getHBaseCluster().getRegions(TABLENAME);
+ List<HRegion> generatedRegions = TEST_UTIL.getHBaseCluster().getRegions(tableName);
Collections.sort(generatedRegions, new Comparator<HRegion>() {
@Override
public int compare(HRegion o1, HRegion o2) {
@@ -213,27 +217,27 @@ public class TestSimpleRegionNormalizerOnCluster {
region.flush(true);
}
- HTableDescriptor htd = admin.getTableDescriptor(TABLENAME);
+ HTableDescriptor htd = admin.getTableDescriptor(tableName);
htd.setNormalizationEnabled(true);
- admin.modifyTable(TABLENAME, htd);
+ admin.modifyTable(tableName, htd);
- admin.flush(TABLENAME);
+ admin.flush(tableName);
- assertEquals(5, MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), TABLENAME));
+ assertEquals(5, MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), tableName));
// Now trigger a merge and stop when the merge is in progress
Thread.sleep(5000); // to let region load to update
m.normalizeRegions();
- while (MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), TABLENAME) > 4) {
+ while (MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), tableName) > 4) {
LOG.info("Waiting for normalization merge to complete");
Thread.sleep(100);
}
- assertEquals(4, MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), TABLENAME));
+ assertEquals(4, MetaTableAccessor.getRegionCount(TEST_UTIL.getConnection(), tableName));
- admin.disableTable(TABLENAME);
- admin.deleteTable(TABLENAME);
+ admin.disableTable(tableName);
+ admin.deleteTable(tableName);
}
private void generateTestData(Region region, int numRows) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
index fb2923a..31eedfc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
@@ -31,16 +31,21 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.AddColumnFamilyState;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
+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 TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestAddColumnFamilyProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout = 60000)
public void testAddColumnFamily() throws Exception {
- final TableName tableName = TableName.valueOf("testAddColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf1 = "cf1";
final String cf2 = "cf2";
final HColumnDescriptor columnDescriptor1 = new HColumnDescriptor(cf1);
@@ -72,7 +77,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testAddSameColumnFamilyTwice() throws Exception {
- final TableName tableName = TableName.valueOf("testAddColumnFamilyTwice");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf2 = "cf2";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf2);
@@ -119,7 +124,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecutionOffline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOffline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf4 = "cf4";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf4);
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -144,7 +149,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecutionOnline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOnline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf5 = "cf5";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf5);
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -168,7 +173,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf6 = "cf6";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf6);
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java
index 5c3d913..c09016c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java
@@ -30,25 +30,29 @@ import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ModifyRegionUtils;
+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;
import static org.junit.Assert.assertTrue;
@Category({MasterTests.class, MediumTests.class})
public class TestCreateTableProcedure extends TestTableDDLProcedureBase {
+ @Rule
+ public TestName name = new TestName();
@Test(timeout=60000)
public void testSimpleCreate() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleCreate");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = null;
testSimpleCreate(tableName, splitKeys);
}
@Test(timeout=60000)
public void testSimpleCreateWithSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleCreateWithSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = new byte[][] {
Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
};
@@ -65,7 +69,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testCreateWithoutColumnFamily() throws Exception {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- final TableName tableName = TableName.valueOf("testCreateWithoutColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
// create table with 0 families will fail
final HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName);
@@ -85,7 +89,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000, expected=TableExistsException.class)
public void testCreateExisting() throws Exception {
- final TableName tableName = TableName.valueOf("testCreateExisting");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, "f");
final HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, null);
@@ -108,7 +112,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
// create the table
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -132,13 +136,13 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=90000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testRollbackAndDoubleExecution(MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2"));
}
@Test(timeout=90000)
public void testRollbackAndDoubleExecutionOnMobTable() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecutionOnMobTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2");
htd.getFamily(Bytes.toBytes("f1")).setMobEnabled(true);
testRollbackAndDoubleExecution(htd);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
index 390eacd..c4bdc18 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
@@ -31,16 +31,21 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyState;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
+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 TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestDeleteColumnFamilyProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout = 60000)
public void testDeleteColumnFamily() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final String cf1 = "cf1";
final String cf2 = "cf2";
@@ -68,7 +73,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testDeleteColumnFamilyTwice() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteColumnFamilyTwice");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final String cf2 = "cf2";
@@ -116,7 +121,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testDeleteNonExistingColumnFamily() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteNonExistingColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final String cf3 = "cf3";
@@ -138,7 +143,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecutionOffline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOffline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf4 = "cf4";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -163,7 +168,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecutionOnline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOnline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf5 = "cf5";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -187,7 +192,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf5 = "cf5";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
index 72a437c..acedf1d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
@@ -43,8 +43,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
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 TestDeleteNamespaceProcedure {
@@ -52,6 +54,9 @@ public class TestDeleteNamespaceProcedure {
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ @Rule
+ public TestName name = new TestName();
+
private static void setupConf(Configuration conf) {
conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
}
@@ -138,7 +143,7 @@ public class TestDeleteNamespaceProcedure {
@Test(timeout=60000)
public void testDeleteNonEmptyNamespace() throws Exception {
final String namespaceName = "testDeleteNonExistNamespace";
- final TableName tableName = TableName.valueOf("testDeleteNonExistNamespace:t1");
+ final TableName tableName = TableName.valueOf("testDeleteNonExistNamespace:" + name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
// create namespace
createNamespaceForTesting(namespaceName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
index 61746a1..431e3e4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
@@ -30,8 +30,10 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
import static org.junit.Assert.assertTrue;
@@ -39,9 +41,12 @@ import static org.junit.Assert.assertTrue;
public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestDeleteTableProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout=60000, expected=TableNotFoundException.class)
public void testDeleteNotExistentTable() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteNotExistentTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedurePrepareLatch latch = new ProcedurePrepareLatch.CompatibilityLatch();
@@ -52,7 +57,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000, expected=TableNotDisabledException.class)
public void testDeleteNotDisabledTable() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteNotDisabledTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
@@ -65,7 +70,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testDeleteDeletedTable() throws Exception {
- final TableName tableName = TableName.valueOf("testDeleteDeletedTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
@@ -97,14 +102,14 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testSimpleDelete() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleDelete");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = null;
testSimpleDelete(tableName, splitKeys);
}
@Test(timeout=60000)
public void testSimpleDeleteWithSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleDeleteWithSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = new byte[][] {
Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
};
@@ -127,7 +132,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
// create the table
byte[][] splitKeys = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableProcedure.java
index ac61dd4..d3fccbe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableProcedure.java
@@ -32,16 +32,21 @@ import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
+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 TestDisableTableProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestDisableTableProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout = 60000)
public void testDisableTable() throws Exception {
- final TableName tableName = TableName.valueOf("testDisableTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2");
@@ -58,7 +63,7 @@ public class TestDisableTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testDisableTableMultipleTimes() throws Exception {
- final TableName tableName = TableName.valueOf("testDisableTableMultipleTimes");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2");
@@ -108,7 +113,7 @@ public class TestDisableTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final byte[][] splitKeys = new byte[][] {
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
index c1b42a9..81f2576 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
@@ -32,16 +32,21 @@ import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
+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 TestEnableTableProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestEnableTableProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout = 60000)
public void testEnableTable() throws Exception {
- final TableName tableName = TableName.valueOf("testEnableTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2");
@@ -59,7 +64,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000, expected=TableNotDisabledException.class)
public void testEnableNonDisabledTable() throws Exception {
- final TableName tableName = TableName.valueOf("testEnableNonExistingTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2");
@@ -92,7 +97,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final byte[][] splitKeys = new byte[][] {
@@ -116,7 +121,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final byte[][] splitKeys = new byte[][] {
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
index a541b43..fc85de2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
@@ -41,8 +41,10 @@ import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.junit.After;
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 TestMasterProcedureEvents {
@@ -50,6 +52,9 @@ public class TestMasterProcedureEvents {
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ @Rule
+ public TestName name = new TestName();
+
private static void setupConf(Configuration conf) {
conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
conf.setBoolean(WALProcedureStore.USE_HSYNC_CONF_KEY, false);
@@ -81,7 +86,7 @@ public class TestMasterProcedureEvents {
@Test(timeout = 30000)
public void testMasterInitializedEvent() throws Exception {
- TableName tableName = TableName.valueOf("testMasterInitializedEvent");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
HMaster master = UTIL.getMiniHBaseCluster().getMaster();
ProcedureExecutor<MasterProcedureEnv> procExec = master.getMasterProcedureExecutor();
@@ -99,7 +104,7 @@ public class TestMasterProcedureEvents {
@Test(timeout = 30000)
public void testServerCrashProcedureEvent() throws Exception {
- TableName tableName = TableName.valueOf("testServerCrashProcedureEventTb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
HMaster master = UTIL.getMiniHBaseCluster().getMaster();
ProcedureExecutor<MasterProcedureEnv> procExec = master.getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.java
index 438736e..356c84f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.java
@@ -39,8 +39,10 @@ import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
import org.junit.Before;
+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 TestMasterProcedureScheduler {
@@ -49,6 +51,9 @@ public class TestMasterProcedureScheduler {
private MasterProcedureScheduler queue;
private Configuration conf;
+ @Rule
+ public TestName name = new TestName();
+
@Before
public void setUp() throws IOException {
conf = HBaseConfiguration.create();
@@ -112,7 +117,7 @@ public class TestMasterProcedureScheduler {
*/
@Test
public void testCreateDeleteTableOperationsWithWriteLock() throws Exception {
- TableName tableName = TableName.valueOf("testtb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final TestTableProcedure dummyProc = new TestTableProcedure(100, tableName,
TableProcedureInterface.TableOperationType.DELETE);
@@ -143,7 +148,7 @@ public class TestMasterProcedureScheduler {
*/
@Test
public void testCreateDeleteTableOperationsWithReadLock() throws Exception {
- final TableName tableName = TableName.valueOf("testtb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final int nitems = 2;
final TestTableProcedure dummyProc = new TestTableProcedure(100, tableName,
@@ -186,7 +191,7 @@ public class TestMasterProcedureScheduler {
*/
@Test
public void testVerifyRwLocks() throws Exception {
- TableName tableName = TableName.valueOf("testtb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
queue.addBack(new TestTableProcedure(1, tableName,
TableProcedureInterface.TableOperationType.EDIT));
queue.addBack(new TestTableProcedure(2, tableName,
@@ -253,8 +258,8 @@ public class TestMasterProcedureScheduler {
public void testVerifyNamespaceRwLocks() throws Exception {
String nsName1 = "ns1";
String nsName2 = "ns2";
- TableName tableName1 = TableName.valueOf(nsName1, "testtb");
- TableName tableName2 = TableName.valueOf(nsName2, "testtb");
+ TableName tableName1 = TableName.valueOf(nsName1, name.getMethodName());
+ TableName tableName2 = TableName.valueOf(nsName2, name.getMethodName());
queue.addBack(new TestNamespaceProcedure(1, nsName1,
TableProcedureInterface.TableOperationType.EDIT));
queue.addBack(new TestTableProcedure(2, tableName1,
@@ -306,7 +311,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testVerifyNamespaceXLock() throws Exception {
String nsName = "ns1";
- TableName tableName = TableName.valueOf(nsName, "testtb");
+ TableName tableName = TableName.valueOf(nsName, name.getMethodName());
queue.addBack(new TestNamespaceProcedure(1, nsName,
TableProcedureInterface.TableOperationType.CREATE));
queue.addBack(new TestTableProcedure(2, tableName,
@@ -331,7 +336,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testXLockWaitingForExecutingSharedLockToRelease() {
- final TableName tableName = TableName.valueOf("testtb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));
queue.addBack(new TestRegionProcedure(1, tableName,
@@ -375,7 +380,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testVerifyRegionLocks() throws Exception {
- final TableName tableName = TableName.valueOf("testtb");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));
final HRegionInfo regionB = new HRegionInfo(tableName, Bytes.toBytes("b"), Bytes.toBytes("c"));
final HRegionInfo regionC = new HRegionInfo(tableName, Bytes.toBytes("c"), Bytes.toBytes("d"));
@@ -448,7 +453,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testVerifySubProcRegionLocks() throws Exception {
- final TableName tableName = TableName.valueOf("testVerifySubProcRegionLocks");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));
final HRegionInfo regionB = new HRegionInfo(tableName, Bytes.toBytes("b"), Bytes.toBytes("c"));
final HRegionInfo regionC = new HRegionInfo(tableName, Bytes.toBytes("c"), Bytes.toBytes("d"));
@@ -508,7 +513,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testInheritedRegionXLock() {
- final TableName tableName = TableName.valueOf("testInheritedRegionXLock");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo region = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));
queue.addBack(new TestRegionProcedure(1, tableName,
@@ -551,7 +556,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testSuspendedProcedure() throws Exception {
- final TableName tableName = TableName.valueOf("testSuspendedProcedure");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
queue.addBack(new TestTableProcedure(1, tableName,
TableProcedureInterface.TableOperationType.READ));
@@ -587,7 +592,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testParentXLockAndChildrenSharedLock() throws Exception {
- final TableName tableName = TableName.valueOf("testParentXLockAndChildrenSharedLock");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo[] regions = generateRegionInfo(tableName);
final TestRegionProcedure[] childProcs = new TestRegionProcedure[regions.length];
for (int i = 0; i < regions.length; ++i) {
@@ -602,7 +607,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testRootXLockAndChildrenSharedLock() throws Exception {
- final TableName tableName = TableName.valueOf("testRootXLockAndChildrenSharedLock");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final HRegionInfo[] regions = generateRegionInfo(tableName);
final TestRegionProcedure[] childProcs = new TestRegionProcedure[regions.length];
for (int i = 0; i < regions.length; ++i) {
@@ -657,7 +662,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testParentXLockAndChildrenXLock() throws Exception {
- final TableName tableName = TableName.valueOf("testParentXLockAndChildrenXLock");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testInheritedXLockAndChildrenXLock(tableName,
new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.EDIT),
new TestTableProcedure(1, 2, tableName, TableProcedureInterface.TableOperationType.EDIT)
@@ -666,7 +671,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testRootXLockAndChildrenXLock() throws Exception {
- final TableName tableName = TableName.valueOf("testRootXLockAndChildrenXLock");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
// simulate 3 procedures: 1 (root), (2) child of root, (3) child of proc-2
testInheritedXLockAndChildrenXLock(tableName,
new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.EDIT),
@@ -698,7 +703,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testYieldWithXLockHeld() throws Exception {
- final TableName tableName = TableName.valueOf("testYieldWithXLockHeld");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
queue.addBack(new TestTableProcedure(1, tableName,
TableProcedureInterface.TableOperationType.EDIT));
@@ -729,7 +734,7 @@ public class TestMasterProcedureScheduler {
@Test
public void testYieldWithSharedLockHeld() throws Exception {
- final TableName tableName = TableName.valueOf("testYieldWithSharedLockHeld");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
queue.addBack(new TestTableProcedure(1, tableName,
TableProcedureInterface.TableOperationType.READ));
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureWalLease.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureWalLease.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureWalLease.java
index 1d72228..6fff813 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureWalLease.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureWalLease.java
@@ -45,8 +45,10 @@ import org.apache.hadoop.hbase.util.ModifyRegionUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
+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;
@@ -54,6 +56,9 @@ import org.mockito.Mockito;
public class TestMasterProcedureWalLease {
private static final Log LOG = LogFactory.getLog(TestMasterProcedureWalLease.class);
+ @Rule
+ public TestName name = new TestName();
+
@ClassRule
public static final TestRule timeout =
CategoryBasedTimeout.forClass(TestMasterProcedureWalLease.class);
@@ -128,7 +133,7 @@ public class TestMasterProcedureWalLease {
backupStore3.recoverLease();
// Try to trigger a command on the master (WAL lease expired on the active one)
- HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(TableName.valueOf("mtb"), "f");
+ HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(TableName.valueOf(name.getMethodName()), "f");
HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, null);
LOG.debug("submit proc");
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
index 74c4ad5..184150b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
@@ -31,16 +31,21 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyState;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
+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 TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestModifyColumnFamilyProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout = 60000)
public void testModifyColumnFamily() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf1 = "cf1";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf1);
int oldBlockSize = columnDescriptor.getBlocksize();
@@ -74,7 +79,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testModifyNonExistingColumnFamily() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyExistingColumnFamily");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf2 = "cf2";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf2);
int oldBlockSize = columnDescriptor.getBlocksize();
@@ -100,7 +105,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecutionOffline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOffline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf3 = "cf3";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf3);
int oldBlockSize = columnDescriptor.getBlocksize();
@@ -129,7 +134,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecutionOnline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOnline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf4 = "cf4";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf4);
int oldBlockSize = columnDescriptor.getBlocksize();
@@ -157,7 +162,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf3 = "cf3";
final HColumnDescriptor columnDescriptor = new HColumnDescriptor(cf3);
int oldBlockSize = columnDescriptor.getBlocksize();
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
index ea9bea2..c5c6484 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
@@ -33,15 +33,19 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyTableState;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
+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 TestModifyTableProcedure extends TestTableDDLProcedureBase {
+ @Rule
+ public TestName name = new TestName();
@Test(timeout=60000)
public void testModifyTable() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf");
@@ -79,7 +83,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testModifyTableAddCF() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyTableAddCF");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1");
@@ -119,7 +123,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testModifyTableDeleteCF() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyTableDeleteCF");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf1 = "cf1";
final String cf2 = "cf2";
final String cf3 = "cf3";
@@ -178,7 +182,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecutionOffline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOffline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf2 = "cf2";
final String cf3 = "cf3";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -219,7 +223,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRecoveryAndDoubleExecutionOnline() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionOnline");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String cf2 = "cf2";
final String cf3 = "cf3";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -259,7 +263,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecutionOnline() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String familyName = "cf2";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -288,7 +292,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecutionOffline() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String familyName = "cf2";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
index 3652bdb..f21fe0b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
@@ -39,8 +39,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
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.*;
@@ -50,6 +52,9 @@ public class TestProcedureAdmin {
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ @Rule
+ public TestName name = new TestName();
+
private static void setupConf(Configuration conf) {
conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
}
@@ -88,7 +93,7 @@ public class TestProcedureAdmin {
@Test(timeout=60000)
public void testAbortProcedureSuccess() throws Exception {
- final TableName tableName = TableName.valueOf("testAbortProcedureSuccess");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
@@ -113,7 +118,7 @@ public class TestProcedureAdmin {
@Test(timeout=60000)
public void testAbortProcedureFailure() throws Exception {
- final TableName tableName = TableName.valueOf("testAbortProcedureFailure");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo[] regions =
@@ -145,7 +150,7 @@ public class TestProcedureAdmin {
@Test(timeout=60000)
public void testAbortProcedureInterruptedNotAllowed() throws Exception {
- final TableName tableName = TableName.valueOf("testAbortProcedureInterruptedNotAllowed");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo[] regions =
@@ -187,7 +192,7 @@ public class TestProcedureAdmin {
@Test(timeout=60000)
public void testListProcedure() throws Exception {
- final TableName tableName = TableName.valueOf("testListProcedure");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
index 8025ca6..479b206 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
@@ -42,8 +42,10 @@ import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
import org.junit.Before;
+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;
import static org.junit.Assert.assertFalse;
@@ -68,6 +70,9 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
private HBaseProtos.SnapshotDescription snapshot = null;
private HTableDescriptor snapshotHTD = null;
+ @Rule
+ public TestName name = new TestName();
+
@Before
@Override
public void setup() throws Exception {
@@ -153,7 +158,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRestoreSnapshotToDifferentTable() throws Exception {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- final TableName restoredTableName = TableName.valueOf("testRestoreSnapshotToDifferentTable");
+ final TableName restoredTableName = TableName.valueOf(name.getMethodName());
final HTableDescriptor newHTD = createHTableDescriptor(restoredTableName, CF1, CF2);
long procId = ProcedureTestingUtility.submitAndWait(
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
index 8977412..c3b910e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
@@ -54,8 +54,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
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 TestSplitTableRegionProcedure {
@@ -69,6 +71,9 @@ public class TestSplitTableRegionProcedure {
private static final int startRowNum = 11;
private static final int rowCount = 60;
+ @Rule
+ public TestName name = new TestName();
+
private static void setupConf(Configuration conf) {
conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
conf.setLong(HConstants.MAJOR_COMPACTION_PERIOD, 0);
@@ -110,7 +115,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testSplitTableRegion() throws Exception {
- final TableName tableName = TableName.valueOf("testSplitTableRegion");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -134,7 +139,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testSplitTableRegionNoStoreFile() throws Exception {
- final TableName tableName = TableName.valueOf("testSplitTableRegionNoStoreFile");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -158,7 +163,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testSplitTableRegionUnevenDaughter() throws Exception {
- final TableName tableName = TableName.valueOf("testSplitTableRegionUnevenDaughter");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -183,7 +188,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testSplitTableRegionEmptyDaughter() throws Exception {
- final TableName tableName = TableName.valueOf("testSplitTableRegionEmptyDaughter");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -212,7 +217,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testSplitTableRegionDeletedRowsDaughter() throws Exception {
- final TableName tableName = TableName.valueOf("testSplitTableRegionDeletedRowsDaughter");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -252,7 +257,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testInvalidSplitKey() throws Exception {
- final TableName tableName = TableName.valueOf("testInvalidSplitKey");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -275,7 +280,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout = 60000)
public void testRollbackAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
@@ -306,7 +311,7 @@ public class TestSplitTableRegionProcedure {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecution() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
HRegionInfo [] regions = MasterProcedureTestingUtility.createTable(
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
index 56b8175..6d9475f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
@@ -30,8 +30,10 @@ import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
+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;
import static org.junit.Assert.assertTrue;
@@ -40,9 +42,12 @@ import static org.junit.Assert.assertTrue;
public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
private static final Log LOG = LogFactory.getLog(TestTruncateTableProcedure.class);
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout=60000)
public void testTruncateNotExistentTable() throws Exception {
- final TableName tableName = TableName.valueOf("testTruncateNotExistentTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
long procId = ProcedureTestingUtility.submitAndWait(procExec,
@@ -57,7 +62,7 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testTruncateNotDisabledTable() throws Exception {
- final TableName tableName = TableName.valueOf("testTruncateNotDisabledTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
@@ -75,13 +80,13 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testSimpleTruncatePreserveSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleTruncatePreserveSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testSimpleTruncate(tableName, true);
}
@Test(timeout=60000)
public void testSimpleTruncateNoPreserveSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testSimpleTruncateNoPreserveSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testSimpleTruncate(tableName, false);
}
@@ -130,13 +135,13 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
@Test(timeout=60000)
public void testRecoveryAndDoubleExecutionPreserveSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionPreserveSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testRecoveryAndDoubleExecution(tableName, true);
}
@Test(timeout=60000)
public void testRecoveryAndDoubleExecutionNoPreserveSplits() throws Exception {
- final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecutionNoPreserveSplits");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
testRecoveryAndDoubleExecution(tableName, false);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java
index 1a27433..30bea8c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java
@@ -42,8 +42,10 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils;
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;
/**
* Test that the snapshot hfile cleaner finds hfiles referenced in a snapshot
@@ -58,6 +60,9 @@ public class TestSnapshotHFileCleaner {
private static Path rootDir;
private static FileSystem fs;
+ @Rule
+ public TestName name = new TestName();
+
/**
* Setup the test environment
*/
@@ -89,7 +94,7 @@ public class TestSnapshotHFileCleaner {
// write an hfile to the snapshot directory
String snapshotName = "snapshot";
byte[] snapshot = Bytes.toBytes(snapshotName);
- TableName tableName = TableName.valueOf("table");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
Path snapshotDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);
HRegionInfo mockRegion = new HRegionInfo(tableName);
Path regionSnapshotDir = new Path(snapshotDir, mockRegion.getEncodedName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java
index 2a97119..f716de6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java
@@ -39,8 +39,10 @@ import org.apache.hadoop.hbase.master.cleaner.HFileLinkCleaner;
import org.apache.hadoop.hbase.procedure.ProcedureCoordinator;
import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;
import org.apache.zookeeper.KeeperException;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
import org.mockito.Mockito;
/**
@@ -50,6 +52,9 @@ import org.mockito.Mockito;
public class TestSnapshotManager {
private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ @Rule
+ public TestName name = new TestName();
+
MasterServices services = Mockito.mock(MasterServices.class);
MetricsMaster metrics = Mockito.mock(MetricsMaster.class);
ProcedureCoordinator coordinator = Mockito.mock(ProcedureCoordinator.class);
@@ -80,7 +85,7 @@ public class TestSnapshotManager {
@Test
public void testInProcess() throws KeeperException, IOException {
- TableName tableName = TableName.valueOf("testTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
SnapshotManager manager = getNewManager();
TakeSnapshotHandler handler = Mockito.mock(TakeSnapshotHandler.class);
assertFalse("Manager is in process when there is no current handler",
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
index bea6cff..3454614 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
@@ -32,8 +32,10 @@ import org.apache.hadoop.hbase.util.Bytes;
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;
@Category(LargeTests.class)
public class TestDefaultMobStoreFlusher {
@@ -47,6 +49,9 @@ public class TestDefaultMobStoreFlusher {
private final static byte [] value1 = Bytes.toBytes("value1");
private final static byte [] value2 = Bytes.toBytes("value2");
+ @Rule
+ public TestName name = new TestName();
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.startMiniCluster(1);
@@ -59,8 +64,8 @@ public class TestDefaultMobStoreFlusher {
@Test
public void testFlushNonMobFile() throws Exception {
- TableName tn = TableName.valueOf("testFlushNonMobFile");
- HTableDescriptor desc = new HTableDescriptor(tn);
+ final TableName tableName = TableName.valueOf(name.getMethodName());
+ HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor hcd = new HColumnDescriptor(family);
hcd.setMaxVersions(4);
desc.addFamily(hcd);
@@ -70,8 +75,8 @@ public class TestDefaultMobStoreFlusher {
@Test
public void testFlushMobFile() throws Exception {
- TableName tn = TableName.valueOf("testFlushMobFile");
- HTableDescriptor desc = new HTableDescriptor(tn);
+ final TableName tableName = TableName.valueOf(name.getMethodName());
+ HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor hcd = new HColumnDescriptor(family);
hcd.setMobEnabled(true);
hcd.setMobThreshold(3L);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java
index 4ddba13..82b51b7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileLink.java
@@ -30,15 +30,19 @@ import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.HFileArchiveUtil;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
@Category(SmallTests.class)
public class TestMobFileLink {
+ @Rule
+ public TestName name = new TestName();
@Test
public void testMobFilePath() throws IOException {
- TableName tableName = TableName.valueOf("testMobFilePath");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
Configuration conf = HBaseConfiguration.create();
FileSystem fs = FileSystem.get(conf);
Path rootDir = FSUtils.getRootDir(conf);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
index a4d984d..4b3128f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
@@ -95,8 +95,10 @@ import org.apache.hadoop.hbase.util.Threads;
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;
@Category(LargeTests.class)
public class TestMobCompactor {
@@ -161,6 +163,9 @@ public class TestMobCompactor {
private static int rowNumPerFile = 2;
private static ExecutorService pool;
+ @Rule
+ public TestName name = new TestName();
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration()
@@ -511,7 +516,6 @@ public class TestMobCompactor {
int mergeSize = 5000;
// change the mob compaction merge size
conf.setLong(MobConstants.MOB_COMPACTION_MERGEABLE_THRESHOLD, mergeSize);
- String tableNameAsString = "testMajorCompactionFromAdmin";
SecureRandom rng = new SecureRandom();
byte[] keyBytes = new byte[AES.KEY_LENGTH];
rng.nextBytes(keyBytes);
@@ -519,7 +523,7 @@ public class TestMobCompactor {
Key cfKey = new SecretKeySpec(keyBytes, algorithm);
byte[] encryptionKey = EncryptionUtil.wrapKey(conf,
conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()), cfKey);
- TableName tableName = TableName.valueOf(tableNameAsString);
+ final TableName tableName = TableName.valueOf(name.getMethodName());
HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor hcd1 = new HColumnDescriptor(family1);
hcd1.setMobEnabled(true);
@@ -649,7 +653,7 @@ public class TestMobCompactor {
byte[] fam = Bytes.toBytes(famStr);
byte[] qualifier = Bytes.toBytes("q1");
byte[] mobVal = Bytes.toBytes("01234567890");
- HTableDescriptor hdt = new HTableDescriptor(TableName.valueOf("testGetAfterCompaction"));
+ HTableDescriptor hdt = new HTableDescriptor(TableName.valueOf(name.getMethodName()));
hdt.addCoprocessor(CompactTwoLatestHfilesCopro.class.getName());
HColumnDescriptor hcd = new HColumnDescriptor(fam);
hcd.setMobEnabled(true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
index 0aa9426..c34f558 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
@@ -56,8 +56,10 @@ import org.junit.AfterClass;
import org.junit.Assert;
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;
@Category(LargeTests.class)
public class TestPartitionedMobCompactor {
@@ -78,6 +80,9 @@ public class TestPartitionedMobCompactor {
private String delSuffix;
private static ExecutorService pool;
+ @Rule
+ public TestName name = new TestName();
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
@@ -320,26 +325,23 @@ public class TestPartitionedMobCompactor {
@Test
public void testCompactDelFilesWithDefaultBatchSize() throws Exception {
- String tableName = "testCompactDelFilesWithDefaultBatchSize";
- testCompactDelFilesAtBatchSize(tableName, MobConstants.DEFAULT_MOB_COMPACTION_BATCH_SIZE,
+ testCompactDelFilesAtBatchSize(name.getMethodName(), MobConstants.DEFAULT_MOB_COMPACTION_BATCH_SIZE,
MobConstants.DEFAULT_MOB_DELFILE_MAX_COUNT);
}
@Test
public void testCompactDelFilesWithSmallBatchSize() throws Exception {
- String tableName = "testCompactDelFilesWithSmallBatchSize";
- testCompactDelFilesAtBatchSize(tableName, 4, MobConstants.DEFAULT_MOB_DELFILE_MAX_COUNT);
+ testCompactDelFilesAtBatchSize(name.getMethodName(), 4, MobConstants.DEFAULT_MOB_DELFILE_MAX_COUNT);
}
@Test
public void testCompactDelFilesChangeMaxDelFileCount() throws Exception {
- String tableName = "testCompactDelFilesWithSmallBatchSize";
- testCompactDelFilesAtBatchSize(tableName, 4, 2);
+ testCompactDelFilesAtBatchSize(name.getMethodName(), 4, 2);
}
@Test
public void testCompactFilesWithDstDirFull() throws Exception {
- String tableName = "testCompactFilesWithDstDirFull";
+ String tableName = name.getMethodName();
fs = FileSystem.get(conf);
FaultyDistributedFileSystem faultyFs = (FaultyDistributedFileSystem)fs;
Path testDir = FSUtils.getRootDir(conf);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
index 37b5c96..25e99b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
@@ -27,8 +27,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Throttle;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+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;
import static org.junit.Assert.assertFalse;
@@ -39,6 +41,9 @@ import static org.junit.Assert.fail;
public class TestQuotaState {
private static final TableName UNKNOWN_TABLE_NAME = TableName.valueOf("unknownTable");
+ @Rule
+ public TestName name = new TestName();
+
@Test(timeout=60000)
public void testQuotaStateBypass() {
QuotaState quotaInfo = new QuotaState();
@@ -52,7 +57,7 @@ public class TestQuotaState {
@Test(timeout=60000)
public void testSimpleQuotaStateOperation() {
- final TableName table = TableName.valueOf("testSimpleQuotaStateOperationTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final int NUM_GLOBAL_THROTTLE = 3;
final int NUM_TABLE_THROTTLE = 2;
@@ -64,11 +69,11 @@ public class TestQuotaState {
assertFalse(quotaInfo.isBypass());
// Set table quota
- quotaInfo.setQuotas(table, buildReqNumThrottle(NUM_TABLE_THROTTLE));
+ quotaInfo.setQuotas(tableName, buildReqNumThrottle(NUM_TABLE_THROTTLE));
assertFalse(quotaInfo.isBypass());
assertTrue(quotaInfo.getGlobalLimiter() == quotaInfo.getTableLimiter(UNKNOWN_TABLE_NAME));
assertThrottleException(quotaInfo.getTableLimiter(UNKNOWN_TABLE_NAME), NUM_GLOBAL_THROTTLE);
- assertThrottleException(quotaInfo.getTableLimiter(table), NUM_TABLE_THROTTLE);
+ assertThrottleException(quotaInfo.getTableLimiter(tableName), NUM_TABLE_THROTTLE);
}
@Test(timeout=60000)
@@ -138,9 +143,9 @@ public class TestQuotaState {
@Test(timeout=60000)
public void testQuotaStateUpdateTableThrottle() {
- final TableName TABLE_A = TableName.valueOf("TableA");
- final TableName TABLE_B = TableName.valueOf("TableB");
- final TableName TABLE_C = TableName.valueOf("TableC");
+ final TableName tableNameA = TableName.valueOf(name.getMethodName() + "A");
+ final TableName tableNameB = TableName.valueOf(name.getMethodName() + "B");
+ final TableName tableNameC = TableName.valueOf(name.getMethodName() + "C");
final int TABLE_A_THROTTLE_1 = 3;
final int TABLE_A_THROTTLE_2 = 11;
final int TABLE_B_THROTTLE = 4;
@@ -155,32 +160,32 @@ public class TestQuotaState {
// Add A B table limiters
UserQuotaState otherQuotaState = new UserQuotaState(LAST_UPDATE_1);
- otherQuotaState.setQuotas(TABLE_A, buildReqNumThrottle(TABLE_A_THROTTLE_1));
- otherQuotaState.setQuotas(TABLE_B, buildReqNumThrottle(TABLE_B_THROTTLE));
+ otherQuotaState.setQuotas(tableNameA, buildReqNumThrottle(TABLE_A_THROTTLE_1));
+ otherQuotaState.setQuotas(tableNameB, buildReqNumThrottle(TABLE_B_THROTTLE));
assertEquals(LAST_UPDATE_1, otherQuotaState.getLastUpdate());
assertFalse(otherQuotaState.isBypass());
quotaInfo.update(otherQuotaState);
assertEquals(LAST_UPDATE_1, quotaInfo.getLastUpdate());
assertFalse(quotaInfo.isBypass());
- assertThrottleException(quotaInfo.getTableLimiter(TABLE_A), TABLE_A_THROTTLE_1);
- assertThrottleException(quotaInfo.getTableLimiter(TABLE_B), TABLE_B_THROTTLE);
- assertNoopLimiter(quotaInfo.getTableLimiter(TABLE_C));
+ assertThrottleException(quotaInfo.getTableLimiter(tableNameA), TABLE_A_THROTTLE_1);
+ assertThrottleException(quotaInfo.getTableLimiter(tableNameB), TABLE_B_THROTTLE);
+ assertNoopLimiter(quotaInfo.getTableLimiter(tableNameC));
// Add C, Remove B, Update A table limiters
otherQuotaState = new UserQuotaState(LAST_UPDATE_2);
- otherQuotaState.setQuotas(TABLE_A, buildReqNumThrottle(TABLE_A_THROTTLE_2));
- otherQuotaState.setQuotas(TABLE_C, buildReqNumThrottle(TABLE_C_THROTTLE));
+ otherQuotaState.setQuotas(tableNameA, buildReqNumThrottle(TABLE_A_THROTTLE_2));
+ otherQuotaState.setQuotas(tableNameC, buildReqNumThrottle(TABLE_C_THROTTLE));
assertEquals(LAST_UPDATE_2, otherQuotaState.getLastUpdate());
assertFalse(otherQuotaState.isBypass());
quotaInfo.update(otherQuotaState);
assertEquals(LAST_UPDATE_2, quotaInfo.getLastUpdate());
assertFalse(quotaInfo.isBypass());
- assertThrottleException(quotaInfo.getTableLimiter(TABLE_A),
+ assertThrottleException(quotaInfo.getTableLimiter(tableNameA),
TABLE_A_THROTTLE_2 - TABLE_A_THROTTLE_1);
- assertThrottleException(quotaInfo.getTableLimiter(TABLE_C), TABLE_C_THROTTLE);
- assertNoopLimiter(quotaInfo.getTableLimiter(TABLE_B));
+ assertThrottleException(quotaInfo.getTableLimiter(tableNameC), TABLE_C_THROTTLE);
+ assertNoopLimiter(quotaInfo.getTableLimiter(tableNameB));
// Remove table limiters
otherQuotaState = new UserQuotaState(LAST_UPDATE_3);
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java
index 5ade57d..3b276ad 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java
@@ -40,8 +40,10 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
/**
* Test the quota table helpers (e.g. CRUD operations)
@@ -53,6 +55,9 @@ public class TestQuotaTableUtil {
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private Connection connection;
+ @Rule
+ public TestName name = new TestName();
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
@@ -83,7 +88,7 @@ public class TestQuotaTableUtil {
@Test
public void testTableQuotaUtil() throws Exception {
- final TableName table = TableName.valueOf("testTableQuotaUtilTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
Quotas quota = Quotas.newBuilder()
.setThrottle(Throttle.newBuilder()
@@ -94,13 +99,13 @@ public class TestQuotaTableUtil {
.build();
// Add user quota and verify it
- QuotaUtil.addTableQuota(this.connection, table, quota);
- Quotas resQuota = QuotaUtil.getTableQuota(this.connection, table);
+ QuotaUtil.addTableQuota(this.connection, tableName, quota);
+ Quotas resQuota = QuotaUtil.getTableQuota(this.connection, tableName);
assertEquals(quota, resQuota);
// Remove user quota and verify it
- QuotaUtil.deleteTableQuota(this.connection, table);
- resQuota = QuotaUtil.getTableQuota(this.connection, table);
+ QuotaUtil.deleteTableQuota(this.connection, tableName);
+ resQuota = QuotaUtil.getTableQuota(this.connection, tableName);
assertEquals(null, resQuota);
}
@@ -129,7 +134,7 @@ public class TestQuotaTableUtil {
@Test
public void testUserQuotaUtil() throws Exception {
- final TableName table = TableName.valueOf("testUserQuotaUtilTable");
+ final TableName tableName = TableName.valueOf(name.getMethodName());
final String namespace = "testNS";
final String user = "testUser";
@@ -159,8 +164,8 @@ public class TestQuotaTableUtil {
assertEquals(quota, resQuota);
// Add user quota for table
- QuotaUtil.addUserQuota(this.connection, user, table, quotaTable);
- Quotas resQuotaTable = QuotaUtil.getUserQuota(this.connection, user, table);
+ QuotaUtil.addUserQuota(this.connection, user, tableName, quotaTable);
+ Quotas resQuotaTable = QuotaUtil.getUserQuota(this.connection, user, tableName);
assertEquals(quotaTable, resQuotaTable);
// Add user quota for namespace
@@ -174,8 +179,8 @@ public class TestQuotaTableUtil {
assertEquals(null, resQuota);
// Delete user quota for table
- QuotaUtil.deleteUserQuota(this.connection, user, table);
- resQuotaTable = QuotaUtil.getUserQuota(this.connection, user, table);
+ QuotaUtil.deleteUserQuota(this.connection, user, tableName);
+ resQuotaTable = QuotaUtil.getUserQuota(this.connection, user, tableName);
assertEquals(null, resQuotaTable);
// Delete user quota for namespace
http://git-wip-us.apache.org/repos/asf/hbase/blob/55c2e2d4/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
index 8435b5a..d00eef1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
@@ -588,10 +588,9 @@ public class TestAtomicOperation {
*/
@Test
public void testPutAndCheckAndPutInParallel() throws Exception {
- final String tableName = "testPutAndCheckAndPut";
Configuration conf = TEST_UTIL.getConfiguration();
conf.setClass(HConstants.REGION_IMPL, MockHRegion.class, HeapSize.class);
- HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName))
+ HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name.getMethodName()))
.addFamily(new HColumnDescriptor(family));
this.region = TEST_UTIL.createLocalHRegion(htd, null, null);
Put[] puts = new Put[1];