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 2018/02/08 00:40:10 UTC
[3/4] hbase git commit: HBASE-19951 Cleanup the explicit timeout
value for test method
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
index 00a5cec..ef52057 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
@@ -188,7 +188,7 @@ public class TestSnapshotMetadata {
/**
* Verify that the describe for a cloned table matches the describe from the original.
*/
- @Test (timeout=300000)
+ @Test
public void testDescribeMatchesAfterClone() throws Exception {
// Clone the original table
final String clonedTableNameAsString = "clone" + originalTableName;
@@ -229,7 +229,7 @@ public class TestSnapshotMetadata {
/**
* Verify that the describe for a restored table matches the describe for one the original.
*/
- @Test (timeout=300000)
+ @Test
public void testDescribeMatchesAfterRestore() throws Exception {
runRestoreWithAdditionalMetadata(false);
}
@@ -238,7 +238,7 @@ public class TestSnapshotMetadata {
* Verify that if metadata changed after a snapshot was taken, that the old metadata replaces the
* new metadata during a restore
*/
- @Test (timeout=300000)
+ @Test
public void testDescribeMatchesAfterMetadataChangeAndRestore() throws Exception {
runRestoreWithAdditionalMetadata(true);
}
@@ -248,7 +248,7 @@ public class TestSnapshotMetadata {
* the restored table's original metadata
* @throws Exception
*/
- @Test (timeout=300000)
+ @Test
public void testDescribeOnEmptyTableMatchesAfterMetadataChangeAndRestore() throws Exception {
runRestoreWithAdditionalMetadata(true, false);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java
index f67411b..bc21f1a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java
@@ -87,7 +87,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
TestReplicationBase.tearDownAfterClass();
}
- @Test(timeout = 300000)
+ @Test
public void disableNotFullReplication() throws Exception {
HTableDescriptor table = new HTableDescriptor(admin2.getTableDescriptor(tableName));
HColumnDescriptor f = new HColumnDescriptor("notReplicatedFamily");
@@ -104,7 +104,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
}
}
- @Test(timeout = 300000)
+ @Test
public void testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception {
admin1.disableTableReplication(tableName);
admin2.disableTable(tableName);
@@ -114,7 +114,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
assertTrue(admin2.tableExists(tableName));
}
- @Test(timeout = 300000)
+ @Test
public void testEnableReplicationWhenReplicationNotEnabled() throws Exception {
HTableDescriptor table = new HTableDescriptor(admin1.getTableDescriptor(tableName));
for (HColumnDescriptor fam : table.getColumnFamilies()) {
@@ -135,7 +135,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
}
}
- @Test(timeout = 300000)
+ @Test
public void testEnableReplicationWhenTableDescriptorIsNotSameInClusters() throws Exception {
HTableDescriptor table = new HTableDescriptor(admin2.getTableDescriptor(tableName));
HColumnDescriptor f = new HColumnDescriptor("newFamily");
@@ -160,7 +160,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
}
}
- @Test(timeout = 300000)
+ @Test
public void testDisableAndEnableReplication() throws Exception {
admin1.disableTableReplication(tableName);
HTableDescriptor table = admin1.getTableDescriptor(tableName);
@@ -174,22 +174,22 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
}
}
- @Test(timeout = 300000, expected = TableNotFoundException.class)
+ @Test(expected = TableNotFoundException.class)
public void testDisableReplicationForNonExistingTable() throws Exception {
admin1.disableTableReplication(TableName.valueOf(name.getMethodName()));
}
- @Test(timeout = 300000, expected = TableNotFoundException.class)
+ @Test(expected = TableNotFoundException.class)
public void testEnableReplicationForNonExistingTable() throws Exception {
admin1.enableTableReplication(TableName.valueOf(name.getMethodName()));
}
- @Test(timeout = 300000, expected = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testDisableReplicationWhenTableNameAsNull() throws Exception {
admin1.disableTableReplication(null);
}
- @Test(timeout = 300000, expected = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testEnableReplicationWhenTableNameAsNull() throws Exception {
admin1.enableTableReplication(null);
}
@@ -198,7 +198,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
* Test enable table replication should create table only in user explicit specified table-cfs.
* HBASE-14717
*/
- @Test(timeout = 300000)
+ @Test
public void testEnableReplicationForExplicitSetTableCfs() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
String peerId = "2";
@@ -239,7 +239,7 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
}
}
- @Test(timeout=300000)
+ @Test
public void testReplicationPeerConfigUpdateCallback() throws Exception {
String peerId = "1";
ReplicationPeerConfig rpc = new ReplicationPeerConfig();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
index 5393b48..abe2888 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
@@ -106,7 +106,7 @@ public class TestConstraint {
* @throws Exception
*/
@SuppressWarnings("unchecked")
- @Test(timeout = 60000)
+ @Test
public void testConstraintFails() throws Exception {
// create the table
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
index ce3c726..d0031ff 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
@@ -165,7 +165,7 @@ public class TestMasterCoprocessorExceptionWithAbort {
UTIL.shutdownMiniCluster();
}
- @Test(timeout=30000)
+ @Test
public void testExceptionFromCoprocessorWhenCreatingTable()
throws IOException {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
index 8c38208..f3e0d4c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
@@ -146,7 +146,7 @@ public class TestMasterCoprocessorExceptionWithRemove {
UTIL.shutdownMiniCluster();
}
- @Test(timeout=30000)
+ @Test
public void testExceptionFromCoprocessorWhenCreatingTable()
throws IOException {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index fcaed63..579b6d3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -1261,7 +1261,7 @@ public class TestMasterObserver {
UTIL.shutdownMiniCluster();
}
- @Test (timeout=180000)
+ @Test
public void testStarted() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1280,7 +1280,7 @@ public class TestMasterObserver {
cp.wasStartMasterCalled());
}
- @Test (timeout=180000)
+ @Test
public void testTableOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
final TableName tableName = TableName.valueOf(name.getMethodName());
@@ -1409,7 +1409,7 @@ public class TestMasterObserver {
}
}
- @Test (timeout=180000)
+ @Test
public void testSnapshotOperations() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1470,7 +1470,7 @@ public class TestMasterObserver {
}
}
- @Test (timeout=180000)
+ @Test
public void testNamespaceOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
String testNamespace = "observed_ns";
@@ -1503,7 +1503,7 @@ public class TestMasterObserver {
}
}
- @Test (timeout=180000)
+ @Test
public void testRegionTransitionOperations() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1592,7 +1592,7 @@ public class TestMasterObserver {
}
}
- @Test (timeout=180000)
+ @Test
public void testTableDescriptorsEnumeration() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1609,7 +1609,7 @@ public class TestMasterObserver {
cp.wasGetTableDescriptorsCalled());
}
- @Test (timeout=180000)
+ @Test
public void testTableNamesEnumeration() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1624,7 +1624,7 @@ public class TestMasterObserver {
cp.wasGetTableNamesCalled());
}
- @Test (timeout=180000)
+ @Test
public void testAbortProcedureOperation() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1639,7 +1639,7 @@ public class TestMasterObserver {
cp.wasAbortProcedureCalled());
}
- @Test (timeout=180000)
+ @Test
public void testGetProceduresOperation() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@@ -1654,7 +1654,7 @@ public class TestMasterObserver {
cp.wasGetProceduresCalled());
}
- @Test (timeout=180000)
+ @Test
public void testGetLocksOperation() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
index 6bfd42b..ef3fa10 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
@@ -378,7 +378,7 @@ public class TestRegionObserverInterface {
}
- @Test(timeout = 300000)
+ @Test
// HBase-3758
public void testHBase3758() throws IOException {
final TableName tableName = TableName.valueOf(name.getMethodName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
index 3e1d41a..8309f47 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
@@ -61,7 +61,7 @@ public class TestRegionServerCoprocessorExceptionWithAbort {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static final TableName TABLE_NAME = TableName.valueOf("observed_table");
- @Test(timeout=60000)
+ @Test
public void testExceptionDuringInitialization() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2); // Let's fail fast.
@@ -88,7 +88,7 @@ public class TestRegionServerCoprocessorExceptionWithAbort {
}
}
- @Test(timeout=60000)
+ @Test
public void testExceptionFromCoprocessorDuringPut() throws Exception {
// set configure to indicate which cp should be loaded
Configuration conf = TEST_UTIL.getConfiguration();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
index f394e57..2d564b6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
@@ -87,7 +87,7 @@ public class TestRegionServerCoprocessorExceptionWithRemove {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout=60000)
+ @Test
public void testExceptionFromCoprocessorDuringPut()
throws IOException, InterruptedException {
// Set watches on the zookeeper nodes for all of the regionservers in the
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java
index 60362b7..9d55372 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java
@@ -44,7 +44,7 @@ public class TestTimeoutExceptionInjector {
/**
* Test that a manually triggered timer fires an exception.
*/
- @Test(timeout = 60000)
+ @Test
public void testTimerTrigger() {
final long time = 10000000; // pick a value that is very far in the future
ForeignExceptionListener listener = Mockito.mock(ForeignExceptionListener.class);
@@ -71,7 +71,7 @@ public class TestTimeoutExceptionInjector {
* Demonstrate TimeoutExceptionInjector semantics -- completion means no more exceptions passed to
* error listener.
*/
- @Test(timeout = 60000)
+ @Test
public void testStartAfterComplete() throws InterruptedException {
final long time = 10;
ForeignExceptionListener listener = Mockito.mock(ForeignExceptionListener.class);
@@ -91,7 +91,7 @@ public class TestTimeoutExceptionInjector {
* Demonstrate TimeoutExceptionInjector semantics -- triggering fires exception and completes
* the timer.
*/
- @Test(timeout = 60000)
+ @Test
public void testStartAfterTrigger() throws InterruptedException {
final long time = 10;
ForeignExceptionListener listener = Mockito.mock(ForeignExceptionListener.class);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
index 00f335e..1937d80 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
@@ -198,7 +198,7 @@ public class TestChangingEncoding {
TEST_UTIL.waitUntilNoRegionsInTransition(TIMEOUT_MS);
}
- @Test(timeout=TIMEOUT_MS)
+ @Test
public void testChangingEncoding() throws Exception {
prepareTest("ChangingEncoding");
for (boolean onlineChange : new boolean[]{false, true}) {
@@ -210,7 +210,7 @@ public class TestChangingEncoding {
}
}
- @Test(timeout=TIMEOUT_MS)
+ @Test
public void testChangingEncodingWithCompaction() throws Exception {
prepareTest("ChangingEncodingWithCompaction");
for (boolean onlineChange : new boolean[]{false, true}) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
index 269fa45..b607ca7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
@@ -73,7 +73,7 @@ public class TestLoadAndSwitchEncodeOnDisk extends
}
@Override
- @Test(timeout=TIMEOUT_MS)
+ @Test
public void loadTest() throws Exception {
Admin admin = TEST_UTIL.getAdmin();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
index dd301b6..856b250 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
@@ -326,7 +326,7 @@ public class TestCacheConfig {
* Assert that when BUCKET_CACHE_COMBINED_KEY is false, the non-default, that we deploy
* LruBlockCache as L1 with a BucketCache for L2.
*/
- @Test (timeout=10000)
+ @Test
public void testBucketCacheConfigL1L2Setup() {
this.conf.set(HConstants.BUCKET_CACHE_IOENGINE_KEY, "offheap");
// Make lru size is smaller than bcSize for sure. Need this to be true so when eviction
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
index 31407a3..be35c74 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
@@ -744,12 +744,12 @@ public class TestHFileBlockIndex {
valueRead);
}
- @Test(timeout=10000)
+ @Test
public void testIntermediateLevelIndicesWithLargeKeys() throws IOException {
testIntermediateLevelIndicesWithLargeKeys(16);
}
- @Test(timeout=10000)
+ @Test
public void testIntermediateLevelIndicesWithLargeKeysWithMinNumEntries() throws IOException {
// because of the large rowKeys, we will end up with a 50-level block index without sanity check
testIntermediateLevelIndicesWithLargeKeys(2);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java
index 134bb62..23fe905 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java
@@ -128,7 +128,7 @@ public class TestHFileEncryption {
return b.getOnDiskSizeWithHeader();
}
- @Test(timeout=20000)
+ @Test
public void testDataBlockEncryption() throws IOException {
final int blocks = 10;
final int[] blockSizes = new int[blocks];
@@ -164,7 +164,7 @@ public class TestHFileEncryption {
}
}
- @Test(timeout=20000)
+ @Test
public void testHFileEncryptionMetadata() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();
CacheConfig cacheConf = new CacheConfig(conf);
@@ -202,7 +202,7 @@ public class TestHFileEncryption {
}
}
- @Test(timeout=6000000)
+ @Test
public void testHFileEncryption() throws Exception {
// Create 1000 random test KVs
RedundantKVGenerator generator = new RedundantKVGenerator();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
index de55afa..b512d2f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java
@@ -77,7 +77,7 @@ public class TestPrefetch {
assertTrue(cc.shouldPrefetchOnOpen());
}
- @Test(timeout=60000)
+ @Test
public void testPrefetch() throws Exception {
Path storeFile = writeStoreFile();
readStoreFile(storeFile);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
index faf259f..a694fcb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
@@ -111,7 +111,7 @@ public class TestBucketWriterThread {
* @throws IOException
* @throws InterruptedException
*/
- @Test (timeout=30000)
+ @Test
public void testNonErrorCase() throws IOException, InterruptedException {
bc.cacheBlock(this.plainKey, this.plainCacheable);
doDrainOfOneEntry(this.bc, this.wt, this.q);
@@ -137,7 +137,7 @@ public class TestBucketWriterThread {
* @throws InterruptedException
*/
@SuppressWarnings("unchecked")
- @Test (timeout=30000)
+ @Test
public void testIOE() throws IOException, InterruptedException {
this.bc.cacheBlock(this.plainKey, plainCacheable);
RAMQueueEntry rqe = q.remove();
@@ -156,7 +156,7 @@ public class TestBucketWriterThread {
* @throws IOException
* @throws InterruptedException
*/
- @Test (timeout=30000)
+ @Test
public void testCacheFullException()
throws IOException, InterruptedException {
this.bc.cacheBlock(this.plainKey, plainCacheable);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java
index d0ef055..b45dd5b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestNettyRpcServer.java
@@ -77,7 +77,7 @@ public class TestNettyRpcServer {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout = 180000)
+ @Test
public void testNettyRpcServer() throws Exception {
final Table table = TEST_UTIL.createTable(TABLE, FAMILY);
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java
index f3d53c1..1d70c97 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java
@@ -171,7 +171,7 @@ public abstract class AbstractTestDLS {
ZKUtil.deleteNodeRecursively(TEST_UTIL.getZooKeeperWatcher(), "/hbase");
}
- @Test(timeout = 300000)
+ @Test
public void testRecoveredEdits() throws Exception {
conf.setLong("hbase.regionserver.hlog.blocksize", 30 * 1024); // create more than one wal
startCluster(NUM_RS);
@@ -250,7 +250,7 @@ public abstract class AbstractTestDLS {
}
}
- @Test(timeout = 300000)
+ @Test
public void testMasterStartsUpWithLogSplittingWork() throws Exception {
conf.setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, NUM_RS - 1);
startCluster(NUM_RS);
@@ -310,7 +310,7 @@ public abstract class AbstractTestDLS {
* @throws Exception
*/
// Was marked flaky before Distributed Log Replay cleanup.
- @Test(timeout = 300000)
+ @Test
public void testWorkerAbort() throws Exception {
LOG.info("testWorkerAbort");
startCluster(3);
@@ -367,7 +367,7 @@ public abstract class AbstractTestDLS {
}
}
- @Test(timeout = 300000)
+ @Test
public void testThreeRSAbort() throws Exception {
LOG.info("testThreeRSAbort");
int numRegionsToCreate = 40;
@@ -402,7 +402,7 @@ public abstract class AbstractTestDLS {
}
}
- @Test(timeout = 30000)
+ @Test
public void testDelayedDeleteOnFailure() throws Exception {
LOG.info("testDelayedDeleteOnFailure");
startCluster(1);
@@ -470,7 +470,7 @@ public abstract class AbstractTestDLS {
}
}
- @Test(timeout = 300000)
+ @Test
public void testReadWriteSeqIdFiles() throws Exception {
LOG.info("testReadWriteSeqIdFiles");
startCluster(2);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 2ebab10..e8f739b 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
@@ -174,7 +174,7 @@ public class TestAssignmentListener {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout=60000)
+ @Test
public void testServerListener() throws IOException, InterruptedException {
ServerManager serverManager = TEST_UTIL.getHBaseCluster().getMaster().getServerManager();
@@ -216,7 +216,7 @@ public class TestAssignmentListener {
}
}
- @Test(timeout=60000)
+ @Test
public void testAssignmentListener() throws IOException, InterruptedException {
AssignmentManager am = TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager();
Admin admin = TEST_UTIL.getAdmin();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorInMemoryStates.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorInMemoryStates.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorInMemoryStates.java
index 5567aba..fcd1638 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorInMemoryStates.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorInMemoryStates.java
@@ -90,7 +90,7 @@ public class TestCatalogJanitorInMemoryStates {
/**
* Test clearing a split parent from memory.
*/
- @Test(timeout = 180000)
+ @Test
public void testInMemoryParentCleanup() throws IOException, InterruptedException {
final AssignmentManager am = TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager();
final ServerManager sm = TEST_UTIL.getHBaseCluster().getMaster().getServerManager();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
index d5e657c..4e852f8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
@@ -103,7 +103,7 @@ public class TestDeadServer {
assertFalse(ds.cleanPreviousInstance(deadServerHostComingAlive));
}
- @Test(timeout = 15000)
+ @Test
public void testCrashProcedureReplay() {
HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
final ProcedureExecutor<MasterProcedureEnv> pExecutor = master.getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java
index 3bc60eb..80f0fb6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java
@@ -64,7 +64,7 @@ public class TestMasterBalanceThrottling {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout = 60000)
+ @Test
public void testThrottlingByBalanceInterval() throws Exception {
// Use default config and start a cluster of two regionservers.
TEST_UTIL.startMiniCluster(2);
@@ -88,7 +88,7 @@ public class TestMasterBalanceThrottling {
TEST_UTIL.deleteTable(tableName);
}
- @Test(timeout = 60000)
+ @Test
public void testThrottlingByMaxRitPercent() throws Exception {
// Set max balancing time to 500 ms and max percent of regions in transition to 0.05
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_BALANCER_MAX_BALANCING, 500);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
index 43e5481..8678684 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
@@ -47,7 +47,7 @@ public class TestMasterFailoverBalancerPersistence {
*
* @throws Exception
*/
- @Test(timeout = 240000)
+ @Test
public void testMasterFailoverBalancerPersistence() throws Exception {
final int NUM_MASTERS = 3;
final int NUM_RS = 1;
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
index 119039f..91955f8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
@@ -85,7 +85,7 @@ public class TestMasterMetrics {
}
}
- @Test(timeout = 300000)
+ @Test
public void testClusterRequests() throws Exception {
// sending fake request to master to see how metric value has changed
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
index a4737e6..ccc6104 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
@@ -58,7 +58,7 @@ public class TestMasterMetricsWrapper {
TEST_UTIL.shutdownMiniCluster();
}
- @Test (timeout = 30000)
+ @Test
public void testInfo() {
HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
MetricsMasterWrapperImpl info = new MetricsMasterWrapperImpl(master);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java
index 47672b4..4c51026 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java
@@ -57,7 +57,7 @@ public class TestMasterShutdown {
* Verifies that all masters are properly shutdown.
* @throws Exception
*/
- @Test (timeout=120000)
+ @Test
public void testMasterShutdown() throws Exception {
final int NUM_MASTERS = 3;
final int NUM_RS = 3;
@@ -103,7 +103,7 @@ public class TestMasterShutdown {
htu.shutdownMiniCluster();
}
- @Test(timeout = 60000)
+ @Test
public void testMasterShutdownBeforeStartingAnyRegionServer() throws Exception {
final int NUM_MASTERS = 1;
final int NUM_RS = 0;
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
index 9b23d49..77c5c58 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
@@ -198,7 +198,8 @@ public class TestMasterTransitions {
* in.
* @see <a href="https://issues.apache.org/jira/browse/HBASE-2428">HBASE-2428</a>
*/
- @Ignore @Test (timeout=300000) public void testRegionCloseWhenNoMetaHBase2428()
+ @Ignore @Test
+ public void testRegionCloseWhenNoMetaHBase2428()
throws Exception {
/*
LOG.info("Running testRegionCloseWhenNoMetaHBase2428");
@@ -253,7 +254,8 @@ public class TestMasterTransitions {
* If confusion between old and new, purportedly meta never comes back. Test
* that meta gets redeployed.
*/
- @Ignore @Test (timeout=300000) public void testAddingServerBeforeOldIsDead2413()
+ @Ignore @Test
+ public void testAddingServerBeforeOldIsDead2413()
throws IOException {
/*
LOG.info("Running testAddingServerBeforeOldIsDead2413");
@@ -380,7 +382,8 @@ public class TestMasterTransitions {
* done.
* @see <a href="https://issues.apache.org/jira/browse/HBASE-2482">HBASE-2482</a>
*/
- @Ignore @Test (timeout=300000) public void testKillRSWithOpeningRegion2482()
+ @Ignore @Test
+ public void testKillRSWithOpeningRegion2482()
throws Exception {
/*
LOG.info("Running testKillRSWithOpeningRegion2482");
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java
index 7e730ae..7faed1c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java
@@ -78,7 +78,7 @@ public class TestMetaShutdownHandler {
* the region server so that it is still up during the master SSH.
* We will check that the master SSH is still successfully done.
*/
- @Test (timeout=180000)
+ @Test
public void testExpireMetaRegionServer() throws Exception {
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster master = cluster.getMaster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
index 2ea05df..56976b3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
@@ -66,7 +66,7 @@ public class TestRestartCluster {
UTIL.shutdownMiniCluster();
}
- @Test (timeout=300000)
+ @Test
public void testClusterRestart() throws Exception {
UTIL.startMiniCluster(3);
while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
@@ -112,7 +112,7 @@ public class TestRestartCluster {
/**
* This tests retaining assignments on a cluster restart
*/
- @Test (timeout=300000)
+ @Test
public void testRetainAssignmentOnRestart() throws Exception {
UTIL.startMiniCluster(2);
while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 e98f3c9..8ecb49d 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
@@ -64,7 +64,7 @@ public class TestRollingRestart {
@Rule
public TestName name = new TestName();
- @Test (timeout=500000)
+ @Test
public void testBasicRollingRestart() throws Exception {
// Start a cluster with 2 masters and 4 regionservers
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index 20bd6cd..c3021f3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -215,7 +215,7 @@ public class TestSplitLogManager {
* Test whether the splitlog correctly creates a task in zookeeper
* @throws Exception
*/
- @Test (timeout=180000)
+ @Test
public void testTaskCreation() throws Exception {
LOG.info("TestTaskCreation - test the creation of a task in zk");
@@ -230,7 +230,7 @@ public class TestSplitLogManager {
assertTrue(slt.isUnassigned(master.getServerName()));
}
- @Test (timeout=180000)
+ @Test
public void testOrphanTaskAcquisition() throws Exception {
LOG.info("TestOrphanTaskAcquisition");
@@ -254,7 +254,7 @@ public class TestSplitLogManager {
waitForCounter(tot_mgr_rescan, 0, 1, to + to/2);
}
- @Test (timeout=180000)
+ @Test
public void testUnassignedOrphan() throws Exception {
LOG.info("TestUnassignedOrphan - an unassigned task is resubmitted at" +
" startup");
@@ -283,7 +283,7 @@ public class TestSplitLogManager {
assertTrue(ZKUtil.checkExists(zkw, tasknode) > version);
}
- @Test (timeout=180000)
+ @Test
public void testMultipleResubmits() throws Exception {
LOG.info("TestMultipleResbmits - no indefinite resubmissions");
conf.setInt("hbase.splitlog.max.resubmit", 2);
@@ -315,7 +315,7 @@ public class TestSplitLogManager {
assertEquals(2L, tot_mgr_resubmit.sum() - tot_mgr_resubmit_force.sum());
}
- @Test (timeout=180000)
+ @Test
public void testRescanCleanup() throws Exception {
LOG.info("TestRescanCleanup - ensure RESCAN nodes are cleaned up");
@@ -344,7 +344,7 @@ public class TestSplitLogManager {
waitForCounter(tot_mgr_rescan_deleted, 0, 1, to/2);
}
- @Test (timeout=180000)
+ @Test
public void testTaskDone() throws Exception {
LOG.info("TestTaskDone - cleanup task node once in DONE state");
@@ -363,7 +363,7 @@ public class TestSplitLogManager {
assertTrue(ZKUtil.checkExists(zkw, tasknode) == -1);
}
- @Test (timeout=180000)
+ @Test
public void testTaskErr() throws Exception {
LOG.info("TestTaskErr - cleanup task node once in ERR state");
@@ -386,7 +386,7 @@ public class TestSplitLogManager {
conf.setInt("hbase.splitlog.max.resubmit", ZKSplitLogManagerCoordination.DEFAULT_MAX_RESUBMIT);
}
- @Test (timeout=180000)
+ @Test
public void testTaskResigned() throws Exception {
LOG.info("TestTaskResigned - resubmit task node once in RESIGNED state");
assertEquals(0, tot_mgr_resubmit.sum());
@@ -412,7 +412,7 @@ public class TestSplitLogManager {
assertTrue(slt.isUnassigned(master.getServerName()));
}
- @Test (timeout=180000)
+ @Test
public void testUnassignedTimeout() throws Exception {
LOG.info("TestUnassignedTimeout - iff all tasks are unassigned then" +
" resubmit");
@@ -448,7 +448,7 @@ public class TestSplitLogManager {
waitForCounter(tot_mgr_resubmit_unassigned, 0, 1, 2 * to + to/2);
}
- @Test (timeout=180000)
+ @Test
public void testDeadWorker() throws Exception {
LOG.info("testDeadWorker");
@@ -476,7 +476,7 @@ public class TestSplitLogManager {
return;
}
- @Test (timeout=180000)
+ @Test
public void testWorkerCrash() throws Exception {
slm = new SplitLogManager(master, conf);
TaskBatch batch = new TaskBatch();
@@ -500,7 +500,7 @@ public class TestSplitLogManager {
Assert.assertEquals(1, tot_mgr_resubmit.sum());
}
- @Test (timeout=180000)
+ @Test
public void testEmptyLogDir() throws Exception {
LOG.info("testEmptyLogDir");
slm = new SplitLogManager(master, conf);
@@ -512,7 +512,7 @@ public class TestSplitLogManager {
assertFalse(fs.exists(emptyLogDirPath));
}
- @Test (timeout = 60000)
+ @Test
public void testLogFilesAreArchived() throws Exception {
LOG.info("testLogFilesAreArchived");
slm = new SplitLogManager(master, conf);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 fa054b4..aa544aa 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
@@ -59,7 +59,7 @@ public class TestTableStateManager {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout = 60000)
+ @Test
public void testUpgradeFromZk() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
TEST_UTIL.startMiniCluster(2, 1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java
index c693963..c4055fe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentOnRSCrash.java
@@ -82,22 +82,22 @@ public class TestAssignmentOnRSCrash {
UTIL.shutdownMiniCluster();
}
- @Test(timeout=30000)
+ @Test
public void testKillRsWithUserRegionWithData() throws Exception {
testCrashRsWithUserRegion(true, true);
}
- @Test(timeout=30000)
+ @Test
public void testKillRsWithUserRegionWithoutData() throws Exception {
testCrashRsWithUserRegion(true, false);
}
- @Test(timeout=30000)
+ @Test
public void testStopRsWithUserRegionWithData() throws Exception {
testCrashRsWithUserRegion(false, true);
}
- @Test(timeout=30000)
+ @Test
public void testStopRsWithUserRegionWithoutData() throws Exception {
testCrashRsWithUserRegion(false, false);
}
@@ -133,12 +133,12 @@ public class TestAssignmentOnRSCrash {
assertTrue("expected RSs to be killed", nkilled > 0);
}
- @Test(timeout=60000)
+ @Test
public void testKillRsWithMetaRegion() throws Exception {
testCrashRsWithMetaRegion(true);
}
- @Test(timeout=60000)
+ @Test
public void testStopRsWithMetaRegion() throws Exception {
testCrashRsWithMetaRegion(false);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java
index 4d0214f..f5e4634 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java
@@ -137,7 +137,7 @@ public class TestRogueRSAssignment {
admin.setBalancerRunning(true, false);
}
- @Test(timeout = 120000)
+ @Test
public void testReportRSWithWrongRegion() throws Exception {
final TableName tableName = TableName.valueOf(this.name.getMethodName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java
index 32b7539..83c63da 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java
@@ -137,7 +137,7 @@ public class TestSplitTableRegionProcedure {
}
}
- @Test(timeout=60000)
+ @Test
public void testSplitTableRegion() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 a437fe9..8a0365f 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
@@ -149,7 +149,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
*
* @throws Exception
*/
- @Test (timeout=180000)
+ @Test
public void testBulkAssignment() throws Exception {
List<ServerName> tmp = getListOfServerNames(randomServers(5, 0));
List<RegionInfo> hris = randomRegions(20);
@@ -190,7 +190,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
* assignment info.
* @throws Exception
*/
- @Test (timeout=180000)
+ @Test
public void testRetainAssignment() throws Exception {
// Test simple case where all same servers are there
List<ServerAndLoad> servers = randomServers(10, 10);
@@ -226,7 +226,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
assertRetainedAssignment(existing, listOfServerNames, assignment);
}
- @Test (timeout=30000)
+ @Test
public void testRandomAssignment() throws Exception {
for (int i = 1; i != 5; ++i) {
LOG.info("run testRandomAssignment() with idle servers:" + i);
@@ -272,7 +272,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
}
}
- @Test (timeout=180000)
+ @Test
public void testRegionAvailability() throws Exception {
// Create a cluster with a few servers, assign them to specific racks
// then assign some regions. The tests should check whether moving a
@@ -351,7 +351,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
assertTrue(!cluster.wouldLowerAvailability(hri1, servers[6]));
}
- @Test (timeout=180000)
+ @Test
public void testRegionAvailabilityWithRegionMoves() throws Exception {
List<RegionInfo> list0 = new ArrayList<>();
List<RegionInfo> list1 = new ArrayList<>();
@@ -466,7 +466,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
}
}
- @Test (timeout=180000)
+ @Test
public void testClusterServersWithSameHostPort() {
// tests whether the BaseLoadBalancer.Cluster can be constructed with servers
// sharing same host and port
@@ -506,7 +506,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase {
}
}
- @Test (timeout=180000)
+ @Test
public void testClusterRegionLocations() {
// tests whether region locations are handled correctly in Cluster
List<ServerName> servers = getListOfServerNames(randomServers(10, 10));
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 2f5e2cc..0d8529b 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
@@ -131,7 +131,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase {
*
* @throws Exception
*/
- @Test (timeout=60000)
+ @Test
public void testBalanceClusterOverall() throws Exception {
Map<TableName, Map<ServerName, List<RegionInfo>>> clusterLoad = new TreeMap<>();
for (int[] mockCluster : clusterStateMocks) {
@@ -169,7 +169,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase {
* level balance while the bytable strategy cannot
* @throws Exception
*/
- @Test (timeout=60000)
+ @Test
public void testImpactOfBalanceClusterOverall() throws Exception {
Map<TableName, Map<ServerName, List<RegionInfo>>> clusterLoad = new TreeMap<>();
Map<ServerName, List<RegionInfo>> clusterServers = mockUniformClusterServers(mockUniformCluster);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java
index 4e48c56..32480ea 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java
@@ -103,7 +103,7 @@ public class TestHFileCleaner {
+ status.getAccessTime();
}
- @Test(timeout = 60 *1000)
+ @Test
public void testHFileCleaning() throws Exception {
final EnvironmentEdge originalEdge = EnvironmentEdgeManager.getDelegate();
String prefix = "someHFileThatWouldBeAUUID";
@@ -340,7 +340,7 @@ public class TestHFileCleaner {
Assert.assertEquals(SMALL_FILE_NUM, cleaner.getNumOfDeletedSmallFiles());
}
- @Test(timeout = 60 * 1000)
+ @Test
public void testOnConfigurationChange() throws Exception {
// constants
final int ORIGINAL_THROTTLE_POINT = 512 * 1024;
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
index 79d9720..9c577fe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
@@ -201,7 +201,7 @@ public class TestLogsCleaner {
}
}
- @Test(timeout=5000)
+ @Test
public void testZnodeCversionChange() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();
ReplicationLogCleaner cleaner = new ReplicationLogCleaner();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
index 0fc3806..f0779af 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
@@ -204,7 +204,7 @@ public class TestReplicationHFileCleaner {
* Test for HBASE-14621. This test will not assert directly anything. Without the fix the test
* will end up in a infinite loop, so it will timeout.
*/
- @Test(timeout = 15000)
+ @Test
public void testForDifferntHFileRefsZnodeVersion() throws Exception {
// 1. Create a file
Path file = new Path(root, "testForDifferntHFileRefsZnodeVersion");
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
index 9f2ad92..94efcc7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
@@ -168,7 +168,7 @@ public class TestSnapshotFromMaster {
* <li>If asking about a snapshot has hasn't occurred, you should get an error.</li>
* </ol>
*/
- @Test(timeout = 300000)
+ @Test
public void testIsDoneContract() throws Exception {
IsSnapshotDoneRequest.Builder builder = IsSnapshotDoneRequest.newBuilder();
@@ -222,7 +222,7 @@ public class TestSnapshotFromMaster {
assertTrue("Completed, on-disk snapshot not found", response.getDone());
}
- @Test(timeout = 300000)
+ @Test
public void testGetCompletedSnapshots() throws Exception {
// first check when there are no snapshots
GetCompletedSnapshotsRequest request = GetCompletedSnapshotsRequest.newBuilder().build();
@@ -253,7 +253,7 @@ public class TestSnapshotFromMaster {
assertEquals("Returned snapshots don't match created snapshots", expected, snapshots);
}
- @Test(timeout = 300000)
+ @Test
public void testDeleteSnapshot() throws Exception {
String snapshotName = "completed";
@@ -280,7 +280,7 @@ public class TestSnapshotFromMaster {
* should be retained, while those that are not in a snapshot should be deleted.
* @throws Exception on failure
*/
- @Test(timeout = 300000)
+ @Test
public void testSnapshotHFileArchiving() throws Exception {
Admin admin = UTIL.getAdmin();
// make sure we don't fail on listing snapshots
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
index 5e1c9ce..85b00d0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
@@ -408,25 +408,25 @@ public class TestLockProcedure {
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);
}
- @Test(timeout = 20000)
+ @Test
public void testRemoteTableLockRecovery() throws Exception {
LockRequest lock = getTableExclusiveLock(tableName1, testMethodName);
testRemoteLockRecovery(lock);
}
- @Test(timeout = 20000)
+ @Test
public void testRemoteNamespaceLockRecovery() throws Exception {
LockRequest lock = getNamespaceLock(namespace, testMethodName);
testRemoteLockRecovery(lock);
}
- @Test(timeout = 20000)
+ @Test
public void testRemoteRegionLockRecovery() throws Exception {
LockRequest lock = getRegionLock(tableRegions1, testMethodName);
testRemoteLockRecovery(lock);
}
- @Test (timeout = 20000)
+ @Test
public void testLocalMasterLockRecovery() throws Exception {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
CountDownLatch latch = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 14b8dc4..6f7f69e 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
@@ -92,7 +92,7 @@ public class TestSimpleRegionNormalizerOnCluster {
TEST_UTIL.shutdownMiniCluster();
}
- @Test(timeout = 90000)
+ @Test
@SuppressWarnings("deprecation")
public void testRegionNormalizationSplitOnCluster() throws Exception {
testRegionNormalizationSplitOnCluster(false);
@@ -179,7 +179,7 @@ public class TestSimpleRegionNormalizerOnCluster {
admin.deleteTable(TABLENAME);
}
- @Test(timeout = 60000)
+ @Test
@SuppressWarnings("deprecation")
public void testRegionNormalizationMergeOnCluster() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
index bb405a5..bda2c8a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
@@ -100,7 +100,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
return htd;
}
- @Test(timeout=60000)
+ @Test
public void testCloneSnapshot() throws Exception {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final TableName clonedTableName = TableName.valueOf("testCloneSnapshot2");
@@ -117,7 +117,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
clonedTableName);
}
- @Test(timeout=60000)
+ @Test
public void testCloneSnapshotToSameTable() throws Exception {
// take the snapshot
SnapshotProtos.SnapshotDescription snapshotDesc = getSnapshot();
@@ -135,7 +135,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
ProcedureTestingUtility.getExceptionCause(result) instanceof TableExistsException);
}
- @Test(timeout=60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final TableName clonedTableName = TableName.valueOf("testRecoveryAndDoubleExecution");
@@ -158,7 +158,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
clonedTableName);
}
- @Test(timeout = 60000)
+ @Test
public void testRollbackAndDoubleExecution() throws Exception {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
final TableName clonedTableName = TableName.valueOf("testRollbackAndDoubleExecution");
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
index c420a53..7a5a9fa 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
@@ -84,7 +84,7 @@ public class TestCreateNamespaceProcedure {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
}
- @Test(timeout = 60000)
+ @Test
public void testCreateNamespace() throws Exception {
final NamespaceDescriptor nsd = NamespaceDescriptor.create("testCreateNamespace").build();
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -98,7 +98,7 @@ public class TestCreateNamespaceProcedure {
validateNamespaceCreated(nsd);
}
- @Test(timeout=60000)
+ @Test
public void testCreateSameNamespaceTwice() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testCreateSameNamespaceTwice").build();
@@ -124,7 +124,7 @@ public class TestCreateNamespaceProcedure {
ProcedureTestingUtility.getExceptionCause(result) instanceof NamespaceExistException);
}
- @Test(timeout=60000)
+ @Test
public void testCreateSystemNamespace() throws Exception {
final NamespaceDescriptor nsd =
UTIL.getAdmin().getNamespaceDescriptor(NamespaceDescriptor.SYSTEM_NAMESPACE.getName());
@@ -141,7 +141,7 @@ public class TestCreateNamespaceProcedure {
ProcedureTestingUtility.getExceptionCause(result) instanceof NamespaceExistException);
}
- @Test(timeout=60000)
+ @Test
public void testCreateNamespaceWithInvalidRegionCount() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testCreateNamespaceWithInvalidRegionCount").build();
@@ -161,7 +161,7 @@ public class TestCreateNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout=60000)
+ @Test
public void testCreateNamespaceWithInvalidTableCount() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testCreateNamespaceWithInvalidTableCount").build();
@@ -181,7 +181,7 @@ public class TestCreateNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout = 60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testRecoveryAndDoubleExecution").build();
@@ -202,7 +202,7 @@ public class TestCreateNamespaceProcedure {
validateNamespaceCreated(nsd);
}
- @Test(timeout = 60000)
+ @Test
public void testRollbackAndDoubleExecution() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testRollbackAndDoubleExecution").build();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 10dca9d..ef859a3 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
@@ -94,7 +94,7 @@ public class TestDeleteNamespaceProcedure {
}
}
- @Test(timeout = 60000)
+ @Test
public void testDeleteNamespace() throws Exception {
final String namespaceName = "testDeleteNamespace";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -110,7 +110,7 @@ public class TestDeleteNamespaceProcedure {
validateNamespaceNotExist(namespaceName);
}
- @Test(timeout=60000)
+ @Test
public void testDeleteNonExistNamespace() throws Exception {
final String namespaceName = "testDeleteNonExistNamespace";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -129,7 +129,7 @@ public class TestDeleteNamespaceProcedure {
ProcedureTestingUtility.getExceptionCause(result) instanceof NamespaceNotFoundException);
}
- @Test(timeout=60000)
+ @Test
public void testDeleteSystemNamespace() throws Exception {
final String namespaceName = NamespaceDescriptor.SYSTEM_NAMESPACE.getName();
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -144,7 +144,7 @@ public class TestDeleteNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout=60000)
+ @Test
public void testDeleteNonEmptyNamespace() throws Exception {
final String namespaceName = "testDeleteNonExistNamespace";
final TableName tableName = TableName.valueOf("testDeleteNonExistNamespace:" + name.getMethodName());
@@ -164,7 +164,7 @@ public class TestDeleteNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout = 60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final String namespaceName = "testRecoveryAndDoubleExecution";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -186,7 +186,7 @@ public class TestDeleteNamespaceProcedure {
validateNamespaceNotExist(namespaceName);
}
- @Test(timeout = 60000)
+ @Test
public void testRollbackAndDoubleExecution() throws Exception {
final String namespaceName = "testRollbackAndDoubleExecution";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 bb41ef0..86ddf92 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
@@ -48,7 +48,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
private static final Logger LOG = LoggerFactory.getLogger(TestDeleteTableProcedure.class);
@Rule public TestName name = new TestName();
- @Test(timeout=60000, expected=TableNotFoundException.class)
+ @Test(expected=TableNotFoundException.class)
public void testDeleteNotExistentTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
@@ -59,7 +59,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
latch.await();
}
- @Test(timeout=60000, expected=TableNotDisabledException.class)
+ @Test(expected=TableNotDisabledException.class)
public void testDeleteNotDisabledTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
@@ -72,7 +72,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
latch.await();
}
- @Test(timeout=60000)
+ @Test
public void testDeleteDeletedTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -103,14 +103,14 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof TableNotFoundException);
}
- @Test(timeout=60000)
+ @Test
public void testSimpleDelete() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = null;
testSimpleDelete(tableName, splitKeys);
}
- @Test(timeout=60000)
+ @Test
public void testSimpleDeleteWithSplits() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final byte[][] splitKeys = new byte[][] {
@@ -132,7 +132,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.validateTableDeletion(getMaster(), tableName);
}
- @Test(timeout=60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 da88789..437cda2 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
@@ -48,7 +48,7 @@ public class TestDisableTableProcedure extends TestTableDDLProcedureBase {
@Rule public TestName name = new TestName();
- @Test(timeout = 60000)
+ @Test
public void testDisableTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -64,7 +64,7 @@ public class TestDisableTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.validateTableIsDisabled(getMaster(), tableName);
}
- @Test(timeout = 60000)
+ @Test
public void testDisableTableMultipleTimes() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -112,7 +112,7 @@ public class TestDisableTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.validateTableIsDisabled(getMaster(), tableName);
}
- @Test(timeout=60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 5aeb665..4211187 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
@@ -47,7 +47,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
private static final Logger LOG = LoggerFactory.getLogger(TestEnableTableProcedure.class);
@Rule public TestName name = new TestName();
- @Test(timeout = 60000)
+ @Test
public void testEnableTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -64,7 +64,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.validateTableIsEnabled(getMaster(), tableName);
}
- @Test(timeout=60000, expected=TableNotDisabledException.class)
+ @Test(expected=TableNotDisabledException.class)
public void testEnableNonDisabledTable() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -97,7 +97,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
Assert.fail("Enable should throw exception through latch.");
}
- @Test(timeout = 60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -120,7 +120,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.validateTableIsEnabled(getMaster(), tableName);
}
- @Test(timeout = 60000)
+ @Test
public void testRollbackAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestFastFailOnProcedureNotRegistered.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestFastFailOnProcedureNotRegistered.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestFastFailOnProcedureNotRegistered.java
index 69285f1..48602dc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestFastFailOnProcedureNotRegistered.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestFastFailOnProcedureNotRegistered.java
@@ -36,7 +36,7 @@ public class TestFastFailOnProcedureNotRegistered extends TestTableDDLProcedureB
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFastFailOnProcedureNotRegistered.class);
- @Test(expected=DoNotRetryIOException.class, timeout = 3000)
+ @Test(expected=DoNotRetryIOException.class)
public void testFastFailOnProcedureNotRegistered() throws IOException {
Admin admin = UTIL.getAdmin();
Map<String, String> props = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/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 83e3843..96bdbde 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
@@ -90,7 +90,7 @@ public class TestMasterProcedureEvents {
}
}
- @Test(timeout = 30000)
+ @Test
public void testMasterInitializedEvent() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
HMaster master = UTIL.getMiniHBaseCluster().getMaster();
@@ -108,7 +108,7 @@ public class TestMasterProcedureEvents {
new CreateTableProcedure(procExec.getEnvironment(), htd, new HRegionInfo[] { hri }));
}
- @Test(timeout = 30000)
+ @Test
public void testServerCrashProcedureEvent() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
HMaster master = UTIL.getMiniHBaseCluster().getMaster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java
index 2c0db61..3cc5a86 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureSchedulerConcurrency.java
@@ -71,7 +71,7 @@ public class TestMasterProcedureSchedulerConcurrency {
* Verify that "write" operations for a single table are serialized,
* but different tables can be executed in parallel.
*/
- @Test(timeout=60000)
+ @Test
public void testConcurrentWriteOps() throws Exception {
final TestTableProcSet procSet = new TestTableProcSet(queue);
@@ -157,7 +157,7 @@ public class TestMasterProcedureSchedulerConcurrency {
}
}
- @Test(timeout=60000)
+ @Test
public void testMasterProcedureSchedulerPerformanceEvaluation() throws Exception {
// Make sure the tool does not get stuck
MasterProcedureSchedulerPerformanceEvaluation.main(new String[] {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
index a58cc69..34e7921 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
@@ -88,7 +88,7 @@ public class TestModifyNamespaceProcedure {
}
- @Test(timeout = 60000)
+ @Test
public void testModifyNamespace() throws Exception {
final NamespaceDescriptor nsd = NamespaceDescriptor.create("testModifyNamespace").build();
final String nsKey1 = "hbase.namespace.quota.maxregions";
@@ -124,7 +124,7 @@ public class TestModifyNamespaceProcedure {
assertEquals(nsValue2, currentNsDescriptor.getConfigurationValue(nsKey2));
}
- @Test(timeout=60000)
+ @Test
public void testModifyNonExistNamespace() throws Exception {
final String namespaceName = "testModifyNonExistNamespace";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -152,7 +152,7 @@ public class TestModifyNamespaceProcedure {
ProcedureTestingUtility.getExceptionCause(result) instanceof NamespaceNotFoundException);
}
- @Test(timeout=60000)
+ @Test
public void testModifyNamespaceWithInvalidRegionCount() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testModifyNamespaceWithInvalidRegionCount").build();
@@ -175,7 +175,7 @@ public class TestModifyNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout=60000)
+ @Test
public void testModifyNamespaceWithInvalidTableCount() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testModifyNamespaceWithInvalidTableCount").build();
@@ -198,7 +198,7 @@ public class TestModifyNamespaceProcedure {
assertTrue(ProcedureTestingUtility.getExceptionCause(result) instanceof ConstraintException);
}
- @Test(timeout = 60000)
+ @Test
public void testRecoveryAndDoubleExecution() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testRecoveryAndDoubleExecution").build();
@@ -227,7 +227,7 @@ public class TestModifyNamespaceProcedure {
assertEquals(nsValue, currentNsDescriptor.getConfigurationValue(nsKey));
}
- @Test(timeout = 60000)
+ @Test
public void testRollbackAndDoubleExecution() throws Exception {
final NamespaceDescriptor nsd =
NamespaceDescriptor.create("testRollbackAndDoubleExecution").build();