You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/05/29 06:09:23 UTC
[hbase] branch master updated: HBASE-22488 Cleanup the explicit
timeout value for test methods
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new ca00cbe HBASE-22488 Cleanup the explicit timeout value for test methods
ca00cbe is described below
commit ca00cbeed21c639622b86967d82a70338689b347
Author: Guanghao <zg...@apache.org>
AuthorDate: Wed May 29 14:09:16 2019 +0800
HBASE-22488 Cleanup the explicit timeout value for test methods
---
.../apache/hadoop/hbase/http/log/TestLogLevel.java | 14 +++++------
.../client/TestSnapshotTemporaryDirectory.java | 29 ++++++++++++++--------
.../hbase/coprocessor/TestMetaTableMetrics.java | 2 +-
.../TestMasterHandlerFullWhenTransitRegion.java | 2 +-
.../hbase/master/TestMasterMetricsWrapper.java | 2 +-
.../hadoop/hbase/master/TestMasterNoCluster.java | 4 +--
.../hbase/master/cleaner/TestLogsCleaner.java | 4 +--
.../apache/hadoop/hbase/quotas/TestQuotaState.java | 2 +-
.../hadoop/hbase/regionserver/TestWALLockup.java | 2 +-
.../throttle/TestStoreHotnessProtector.java | 2 +-
.../security/access/TestAccessController.java | 4 +--
11 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
index 1cfe23e..5b86f91 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
@@ -185,7 +185,7 @@ public class TestLogLevel {
* Test client command line options. Does not validate server behavior.
* @throws Exception if commands return unexpected results.
*/
- @Test(timeout=120000)
+ @Test
public void testCommandOptions() throws Exception {
final String className = this.getClass().getName();
@@ -379,7 +379,7 @@ public class TestLogLevel {
*
* @throws Exception if client can't set log level to INFO.
*/
- @Test(timeout=60000)
+ @Test
public void testInfoLogLevel() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, true, "INFO");
}
@@ -389,7 +389,7 @@ public class TestLogLevel {
*
* @throws Exception if client can't set log level to ERROR.
*/
- @Test(timeout=60000)
+ @Test
public void testErrorLogLevel() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, true, "ERROR");
}
@@ -400,7 +400,7 @@ public class TestLogLevel {
* @throws Exception if http client can't access http server,
* or http client can access https server.
*/
- @Test(timeout=60000)
+ @Test
public void testLogLevelByHttp() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, false);
try {
@@ -419,7 +419,7 @@ public class TestLogLevel {
* @throws Exception if http client can't access http server,
* or http client can access https server.
*/
- @Test(timeout=60000)
+ @Test
public void testLogLevelByHttpWithSpnego() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTP, true);
try {
@@ -438,7 +438,7 @@ public class TestLogLevel {
* @throws Exception if https client can't access https server,
* or https client can access http server.
*/
- @Test(timeout=60000)
+ @Test
public void testLogLevelByHttps() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTPS,
false);
@@ -459,7 +459,7 @@ public class TestLogLevel {
* @throws Exception if https client can't access https server,
* or https client can access http server.
*/
- @Test(timeout=60000)
+ @Test
public void testLogLevelByHttpsWithSpnego() throws Exception {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTPS,
true);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
index a8561d0..b1def75 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
@@ -100,7 +100,8 @@ public class TestSnapshotTemporaryDirectory {
*
* @throws Exception on failure
*/
- @BeforeClass public static void setupCluster() throws Exception {
+ @BeforeClass
+ public static void setupCluster() throws Exception {
setupConf(UTIL.getConfiguration());
UTIL.startMiniCluster(NUM_RS);
admin = UTIL.getHBaseAdmin();
@@ -124,7 +125,8 @@ public class TestSnapshotTemporaryDirectory {
conf.set(SnapshotDescriptionUtils.SNAPSHOT_WORKING_DIR, "file://" + new Path(TEMP_DIR, ".tmpDir").toUri());
}
- @Before public void setup() throws Exception {
+ @Before
+ public void setup() throws Exception {
HTableDescriptor htd = new HTableDescriptor(TABLE_NAME);
htd.setRegionReplication(getNumReplicas());
UTIL.createTable(htd, new byte[][] { TEST_FAM }, UTIL.getConfiguration());
@@ -134,13 +136,15 @@ public class TestSnapshotTemporaryDirectory {
return 1;
}
- @After public void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
UTIL.deleteTable(TABLE_NAME);
SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());
SnapshotTestingUtils.deleteArchiveDirectory(UTIL);
}
- @AfterClass public static void cleanupTest() {
+ @AfterClass
+ public static void cleanupTest() {
try {
UTIL.shutdownMiniCluster();
FileUtils.deleteDirectory(new File(TEMP_DIR));
@@ -149,7 +153,8 @@ public class TestSnapshotTemporaryDirectory {
}
}
- @Test(timeout = 180000) public void testRestoreDisabledSnapshot()
+ @Test
+ public void testRestoreDisabledSnapshot()
throws IOException, InterruptedException {
long tid = System.currentTimeMillis();
TableName tableName = TableName.valueOf("testtb-" + tid);
@@ -215,7 +220,8 @@ public class TestSnapshotTemporaryDirectory {
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());
}
- @Test(timeout = 180000) public void testRestoreEnabledSnapshot()
+ @Test
+ public void testRestoreEnabledSnapshot()
throws IOException, InterruptedException {
long tid = System.currentTimeMillis();
TableName tableName = TableName.valueOf("testtb-" + tid);
@@ -282,7 +288,8 @@ public class TestSnapshotTemporaryDirectory {
*
* @throws Exception if snapshot does not complete successfully
*/
- @Test(timeout = 300000) public void testOfflineTableSnapshot() throws Exception {
+ @Test
+ public void testOfflineTableSnapshot() throws Exception {
Admin admin = UTIL.getHBaseAdmin();
// make sure we don't fail on listing snapshots
SnapshotTestingUtils.assertNoSnapshots(admin);
@@ -336,7 +343,8 @@ public class TestSnapshotTemporaryDirectory {
*
* @throws Exception if snapshot does not complete successfully
*/
- @Test(timeout = 180000) public void testSnapshotCloneContents() throws Exception {
+ @Test
+ public void testSnapshotCloneContents() throws Exception {
// make sure we don't fail on listing snapshots
SnapshotTestingUtils.assertNoSnapshots(admin);
@@ -372,7 +380,8 @@ public class TestSnapshotTemporaryDirectory {
admin.close();
}
- @Test(timeout = 180000) public void testOfflineTableSnapshotWithEmptyRegion() throws Exception {
+ @Test
+ public void testOfflineTableSnapshotWithEmptyRegion() throws Exception {
// test with an empty table with one region
// make sure we don't fail on listing snapshots
@@ -417,7 +426,7 @@ public class TestSnapshotTemporaryDirectory {
}
// Ensures that the snapshot is transferred to the proper completed snapshot directory
- @Test(timeout = 180000)
+ @Test
public void testEnsureTemporaryDirectoryTransfer() throws Exception {
Admin admin = UTIL.getAdmin();
TableName tableName2 = TableName.valueOf("testListTableSnapshots");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
index 82ce709..16db86d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
@@ -232,7 +232,7 @@ public class TestMetaTableMetrics {
assertEquals(5L, putWithClientMetricsCount);
}
- @Test(timeout = 30000)
+ @Test
public void testConcurrentAccess() {
try {
tablename = Bytes.toBytes("hbase:meta");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
index e136cdd..e41054e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
@@ -63,7 +63,7 @@ public class TestMasterHandlerFullWhenTransitRegion {
UTIL.createTable(TableName.valueOf(TABLENAME), "fa");
}
- @Test(timeout = 30000)
+ @Test
public void test() throws Exception {
RegionInfo regionInfo = UTIL.getAdmin().getRegions(TableName.valueOf(TABLENAME)).get(0);
//See HBASE-21754
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 1f0323e..c11386a 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
@@ -116,7 +116,7 @@ public class TestMasterMetricsWrapper {
/**
* tests online and offline region number
*/
- @Test (timeout=30000)
+ @Test
public void testOfflineRegion() throws Exception {
HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
MetricsMasterWrapperImpl info = new MetricsMasterWrapperImpl(master);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
index e73ba75..74d0548 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
@@ -309,7 +309,7 @@ public class TestMasterNoCluster {
}
}
- @Test(timeout = 60000)
+ @Test
public void testMasterInitWithSameClientServerZKQuorum() throws Exception {
Configuration conf = new Configuration(TESTUTIL.getConfiguration());
conf.set(HConstants.CLIENT_ZOOKEEPER_QUORUM, HConstants.LOCALHOST);
@@ -320,7 +320,7 @@ public class TestMasterNoCluster {
master.join();
}
- @Test(timeout = 60000)
+ @Test
public void testMasterInitWithObserverModeClientZKQuorum() throws Exception {
Configuration conf = new Configuration(TESTUTIL.getConfiguration());
Assert.assertFalse(Boolean.getBoolean(HConstants.CLIENT_ZOOKEEPER_OBSERVER_MODE));
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 4d254a0..b02704b 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
@@ -223,7 +223,7 @@ public class TestLogsCleaner {
}
}
- @Test(timeout=10000)
+ @Test
public void testZooKeeperAbortDuringGetListOfReplicators() throws Exception {
ReplicationLogCleaner cleaner = new ReplicationLogCleaner();
@@ -270,7 +270,7 @@ public class TestLogsCleaner {
* When zk is working both files should be returned
* @throws Exception from ZK watcher
*/
- @Test(timeout=10000)
+ @Test
public void testZooKeeperNormal() throws Exception {
ReplicationLogCleaner cleaner = new ReplicationLogCleaner();
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 73b253c..4c359f0 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
@@ -203,7 +203,7 @@ public class TestQuotaState {
assertNoopLimiter(quotaInfo.getTableLimiter(UNKNOWN_TABLE_NAME));
}
- @Test(timeout = 60000)
+ @Test
public void testTableThrottleWithBatch() {
final TableName TABLE_A = TableName.valueOf("TableA");
final int TABLE_A_THROTTLE_1 = 3;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
index 0e20252..0d748e4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
@@ -314,7 +314,7 @@ public class TestWALLockup {
* If below is broken, we will see this test timeout because RingBufferEventHandler was stuck in
* attainSafePoint. Everyone will wait for sync to finish forever. See HBASE-14317.
*/
- @Test (timeout=30000)
+ @Test
public void testRingBufferEventHandlerStuckWhenSyncFailed()
throws IOException, InterruptedException {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
index 67ac1c3..218b41d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
@@ -53,7 +53,7 @@ public class TestStoreHotnessProtector {
@ClassRule public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestStoreHotnessProtector.class);
- @Test(timeout = 60000)
+ @Test
public void testPreparePutCounter() throws Exception {
ExecutorService executorService = Executors.newFixedThreadPool(10);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index 523b82f..31f2adf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -3180,7 +3180,7 @@ public class TestAccessController extends SecureTestUtil {
verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE, USER_OWNER, USER_ADMIN);
}
- @Test(timeout = 180000)
+ @Test
public void testGetUserPermissions() throws Throwable {
Connection conn = null;
try {
@@ -3308,7 +3308,7 @@ public class TestAccessController extends SecureTestUtil {
}
}
- @Test(timeout = 180000)
+ @Test
public void testHasPermission() throws Throwable {
Connection conn = null;
try {