Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22488 Cleanup the explicit timeout value for test methods

This commit is contained in:
Guanghao 2019-05-29 14:09:16 +08:00 committed by Guanghao Zhang
parent 6876199bac
commit 78319fab87
10 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
View File

@ -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);

32
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
View File

@ -99,7 +99,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();
@ -123,7 +124,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());
@ -133,13 +135,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));
@ -148,7 +152,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);
@ -214,7 +219,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);
@ -281,7 +287,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);
@ -335,7 +342,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);
@ -371,7 +379,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
@ -416,7 +425,8 @@ public class TestSnapshotTemporaryDirectory {
}
// Ensures that the snapshot is transferred to the proper completed snapshot directory
@Test(timeout = 180000) public void testEnsureTemporaryDirectoryTransfer() throws Exception {
@Test
public void testEnsureTemporaryDirectoryTransfer() throws Exception {
Admin admin = null;
TableName tableName2 = TableName.valueOf("testListTableSnapshots");
try {
@ -468,4 +478,4 @@ public class TestSnapshotTemporaryDirectory {
manifestVersion);
admin.snapshot(desc);
}
}
}

2
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
View File

@ -232,7 +232,7 @@ public class TestMetaTableMetrics {
assertEquals(5L, putWithClientMetricsCount);
}
@Test(timeout = 30000)
@Test
public void testConcurrentAccess() {
try {
tablename = Bytes.toBytes("hbase:meta");

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
View File

@ -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

4
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
View File

@ -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));

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
View File

@ -261,7 +261,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();

2
hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
View File

@ -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;

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
View File

@ -313,7 +313,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 {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
View File

@ -52,7 +52,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);

4
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
View File

@ -3162,7 +3162,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 {
@ -3290,7 +3290,7 @@ public class TestAccessController extends SecureTestUtil {
}
}
@Test(timeout = 180000)
@Test
public void testHasPermission() throws Throwable {
Connection conn = null;
try {