Repository: hbase Updated Branches: refs/heads/HBASE-19397-branch-2 2fe4aa10e -> a98b04f49 (forced update)
http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java index 15066dd..ab67d94 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java @@ -174,7 +174,7 @@ public class TestRegionReplicaReplicationEndpointNoMaster { } } - @Test (timeout = 240000) + @Test public void testReplayCallable() throws Exception { // tests replaying the edits to a secondary region replica using the Callable directly openRegion(HTU, rs0, hriSecondary); @@ -214,7 +214,7 @@ public class TestRegionReplicaReplicationEndpointNoMaster { } } - @Test (timeout = 240000) + @Test public void testReplayCallableWithRegionMove() throws Exception { // tests replaying the edits to a secondary region replica using the Callable directly while // the region is moved to another location.It tests handling of RME. @@ -249,7 +249,7 @@ public class TestRegionReplicaReplicationEndpointNoMaster { connection.close(); } - @Test (timeout = 240000) + @Test public void testRegionReplicaReplicationEndpointReplicate() throws Exception { // tests replaying the edits to a secondary region replica using the RRRE.replicate() openRegion(HTU, rs0, hriSecondary); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java index 5f7be5c..c4d529e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java @@ -41,7 +41,7 @@ public class TestReplicationThrottler { /** * unit test for throttling */ - @Test(timeout=10000) + @Test public void testThrottling() { LOG.info("testThrottling"); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java index e62c76e..e6f07f1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java @@ -99,7 +99,7 @@ public class TestAccessControlFilter extends SecureTestUtil { TEST_UTIL.shutdownMiniCluster(); } - @Test (timeout=180000) + @Test public void testQualifierAccess() throws Exception { final Table table = createTable(TEST_UTIL, TABLE, new byte[][] { FAMILY }); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java ---------------------------------------------------------------------- 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 ba781d6..100c0cc 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 @@ -340,7 +340,7 @@ public class TestAccessController extends SecureTestUtil { TEST_TABLE.getNamespaceAsString()).size()); } - @Test (timeout=180000) + @Test public void testUnauthorizedShutdown() throws Exception { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { @@ -353,7 +353,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testUnauthorizedStopMaster() throws Exception { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { @@ -367,7 +367,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testSecurityCapabilities() throws Exception { List<SecurityCapability> capabilities = TEST_UTIL.getConnection().getAdmin() .getSecurityCapabilities(); @@ -377,7 +377,7 @@ public class TestAccessController extends SecureTestUtil { capabilities.contains(SecurityCapability.CELL_AUTHORIZATION)); } - @Test (timeout=180000) + @Test public void testTableCreate() throws Exception { AccessTestAction createTable = new AccessTestAction() { @Override @@ -397,7 +397,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testTableModify() throws Exception { AccessTestAction modifyTable = new AccessTestAction() { @Override @@ -416,7 +416,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(modifyTable, USER_RW, USER_RO, USER_NONE, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testTableDelete() throws Exception { AccessTestAction deleteTable = new AccessTestAction() { @Override @@ -432,7 +432,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(deleteTable, USER_RW, USER_RO, USER_NONE, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testTableTruncate() throws Exception { AccessTestAction truncateTable = new AccessTestAction() { @Override @@ -449,7 +449,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(truncateTable, USER_RW, USER_RO, USER_NONE, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testTableDisable() throws Exception { AccessTestAction disableTable = new AccessTestAction() { @Override @@ -478,7 +478,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_CREATE, USER_GROUP_ADMIN, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testTableEnable() throws Exception { AccessTestAction enableTable = new AccessTestAction() { @Override @@ -592,7 +592,7 @@ public class TestAccessController extends SecureTestUtil { getProceduresAction, USER_RW, USER_RO, USER_NONE, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testGetLocks() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -607,7 +607,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testMove() throws Exception { List<HRegionLocation> regions; try (RegionLocator locator = systemUserConnection.getRegionLocator(TEST_TABLE)) { @@ -630,7 +630,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testAssign() throws Exception { List<HRegionLocation> regions; try (RegionLocator locator = systemUserConnection.getRegionLocator(TEST_TABLE)) { @@ -651,7 +651,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testUnassign() throws Exception { List<HRegionLocation> regions; try (RegionLocator locator = systemUserConnection.getRegionLocator(TEST_TABLE)) { @@ -672,7 +672,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testRegionOffline() throws Exception { List<HRegionLocation> regions; try (RegionLocator locator = systemUserConnection.getRegionLocator(TEST_TABLE)) { @@ -693,7 +693,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testSetSplitOrMergeEnabled() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -709,7 +709,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testBalance() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -724,7 +724,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testBalanceSwitch() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -739,7 +739,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testShutdown() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -754,7 +754,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testStopMaster() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -775,7 +775,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(action, USER_NONE, USER_RO, USER_GROUP_ADMIN, USER_GROUP_READ, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testSplitWithSplitRow() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); createTestTable(tableName); @@ -795,7 +795,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testFlush() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -811,7 +811,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(action, USER_RW, USER_RO, USER_NONE, USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testCompact() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -839,7 +839,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testRead() throws Exception { // get action AccessTestAction getAction = new AccessTestAction() { @@ -879,7 +879,7 @@ public class TestAccessController extends SecureTestUtil { verifyRead(scanAction); } - @Test (timeout=180000) + @Test // test put, delete, increment public void testWrite() throws Exception { // put action @@ -928,7 +928,7 @@ public class TestAccessController extends SecureTestUtil { verifyWrite(incrementAction); } - @Test (timeout=180000) + @Test public void testReadWrite() throws Exception { // action for checkAndDelete AccessTestAction checkAndDeleteAction = new AccessTestAction() { @@ -963,7 +963,7 @@ public class TestAccessController extends SecureTestUtil { verifyReadWrite(checkAndPut); } - @Test (timeout=180000) + @Test public void testBulkLoad() throws Exception { try { FileSystem fs = TEST_UTIL.getTestFileSystem(); @@ -1080,7 +1080,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testAppend() throws Exception { AccessTestAction appendAction = new AccessTestAction() { @@ -1107,7 +1107,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_ADMIN); } - @Test (timeout=180000) + @Test public void testGrantRevoke() throws Exception { AccessTestAction grantAction = new AccessTestAction() { @Override @@ -1189,7 +1189,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testPostGrantRevoke() throws Exception { final TableName tableName = TableName.valueOf("TempTable"); @@ -1443,7 +1443,7 @@ public class TestAccessController extends SecureTestUtil { return perms.contains(userPermission); } - @Test (timeout=180000) + @Test public void testPostGrantRevokeAtQualifierLevel() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); final byte[] family1 = Bytes.toBytes("f1"); @@ -1546,7 +1546,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testPermissionList() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); final byte[] family1 = Bytes.toBytes("f1"); @@ -1676,7 +1676,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testGlobalPermissionList() throws Exception { List<UserPermission> perms; Table acl = systemUserConnection.getTable(AccessControlLists.ACL_TABLE_NAME); @@ -1710,7 +1710,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(action, USER_CREATE, USER_RW, USER_NONE, USER_RO); } - @Test (timeout=180000) + @Test public void testCheckPermissions() throws Exception { // -------------------------------------- // test global permissions @@ -1877,7 +1877,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testStopRegionServer() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -1892,7 +1892,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testRollWALWriterRequest() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -1907,7 +1907,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testOpenRegion() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -1922,7 +1922,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testCloseRegion() throws Exception { AccessTestAction action = new AccessTestAction() { @Override @@ -1937,7 +1937,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE); } - @Test (timeout=180000) + @Test public void testSnapshot() throws Exception { Admin admin = TEST_UTIL.getAdmin(); final HTableDescriptor htd = admin.getTableDescriptor(TEST_TABLE); @@ -1996,7 +1996,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testSnapshotWithOwner() throws Exception { Admin admin = TEST_UTIL.getAdmin(); final HTableDescriptor htd = admin.getTableDescriptor(TEST_TABLE); @@ -2052,7 +2052,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testGlobalAuthorizationForNewRegisteredRS() throws Exception { LOG.debug("Test for global authorization for a new registered RegionServer."); MiniHBaseCluster hbaseCluster = TEST_UTIL.getHBaseCluster(); @@ -2115,7 +2115,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testTableDescriptorsEnumeration() throws Exception { User TABLE_ADMIN = User.createUserForTesting(conf, "UserA", new String[0]); @@ -2159,7 +2159,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testTableNameEnumeration() throws Exception { AccessTestAction listTablesAction = new AccessTestAction() { @Override @@ -2181,7 +2181,7 @@ public class TestAccessController extends SecureTestUtil { verifyIfEmptyList(listTablesAction, USER_NONE); } - @Test (timeout=180000) + @Test public void testTableDeletion() throws Exception { User TABLE_ADMIN = User.createUserForTesting(conf, "TestUser", new String[0]); final TableName tableName = TableName.valueOf(name.getMethodName()); @@ -2220,7 +2220,7 @@ public class TestAccessController extends SecureTestUtil { createTable(TEST_UTIL, htd, new byte[][] { Bytes.toBytes("s") }); } - @Test (timeout=180000) + @Test public void testNamespaceUserGrant() throws Exception { AccessTestAction getAction = new AccessTestAction() { @Override @@ -2244,7 +2244,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(getAction, USER_NONE); } - @Test (timeout=180000) + @Test public void testAccessControlClientGrantRevoke() throws Exception { // Create user for testing, who has no READ privileges by default. User testGrantRevoke = User.createUserForTesting(conf, "testGrantRevoke", new String[0]); @@ -2283,7 +2283,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(getAction, testGrantRevoke); } - @Test (timeout=180000) + @Test public void testAccessControlClientGlobalGrantRevoke() throws Exception { // Create user for testing, who has no READ privileges by default. User testGlobalGrantRevoke = User.createUserForTesting(conf, @@ -2329,7 +2329,7 @@ public class TestAccessController extends SecureTestUtil { } - @Test(timeout = 180000) + @Test public void testAccessControlClientMultiGrantRevoke() throws Exception { User testGrantRevoke = User.createUserForTesting(conf, "testGrantRevoke", new String[0]); @@ -2452,7 +2452,7 @@ public class TestAccessController extends SecureTestUtil { verifyDenied(putAction, testGrantRevoke); } - @Test (timeout=180000) + @Test public void testAccessControlClientGrantRevokeOnNamespace() throws Exception { // Create user for testing, who has no READ privileges by default. User testNS = User.createUserForTesting(conf, "testNS", new String[0]); @@ -2542,7 +2542,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testCoprocessorExec() throws Exception { // Set up our ping endpoint service on all regions of our test table for (JVMClusterUtil.RegionServerThread thread: @@ -2593,7 +2593,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testSetQuota() throws Exception { AccessTestAction setUserQuotaAction = new AccessTestAction() { @Override @@ -2660,7 +2660,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_READ, USER_GROUP_WRITE, USER_GROUP_CREATE); } - @Test (timeout=180000) + @Test public void testGetNamespacePermission() throws Exception { String namespace = "testGetNamespacePermission"; NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build(); @@ -2703,7 +2703,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testTruncatePerms() throws Exception { try { List<UserPermission> existingPerms = AccessControlClient.getUserPermissions( @@ -2736,7 +2736,7 @@ public class TestAccessController extends SecureTestUtil { }; } - @Test (timeout=180000) + @Test public void testAccessControlClientUserPerms() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); createTestTable(tableName); @@ -2755,7 +2755,7 @@ public class TestAccessController extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testAccessControllerUserPermsRegexHandling() throws Exception { User testRegexHandler = User.createUserForTesting(conf, "testRegexHandling", new String[0]); @@ -2812,7 +2812,7 @@ public class TestAccessController extends SecureTestUtil { USER_GROUP_ADMIN); } - @Test (timeout=180000) + @Test public void testPrepareAndCleanBulkLoad() throws Exception { AccessTestAction prepareBulkLoadAction = new AccessTestAction() { @Override @@ -2832,7 +2832,7 @@ public class TestAccessController extends SecureTestUtil { verifyAnyCreate(cleanupBulkLoadAction); } - @Test (timeout=180000) + @Test public void testReplicateLogEntries() throws Exception { AccessTestAction replicateLogEntriesAction = new AccessTestAction() { @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java index 17de97b..f023aed 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java @@ -177,7 +177,7 @@ public class TestAccessController2 extends SecureTestUtil { assertEquals(0, AccessControlLists.getNamespacePermissions(conf, namespace).size()); } - @Test (timeout=180000) + @Test public void testCreateWithCorrectOwner() throws Exception { // Create a test user final User testUser = User.createUserForTesting(TEST_UTIL.getConfiguration(), "TestUser", @@ -214,7 +214,7 @@ public class TestAccessController2 extends SecureTestUtil { assertTrue(perms.get(0).implies(Permission.Action.ADMIN)); } - @Test (timeout=180000) + @Test public void testCreateTableWithGroupPermissions() throws Exception { grantGlobal(TEST_UTIL, TESTGROUP_1_NAME, Action.CREATE); try { @@ -239,7 +239,7 @@ public class TestAccessController2 extends SecureTestUtil { } } - @Test (timeout=180000) + @Test public void testACLTableAccess() throws Exception { final Configuration conf = TEST_UTIL.getConfiguration(); @@ -348,7 +348,7 @@ public class TestAccessController2 extends SecureTestUtil { /* * Test table scan operation at table, column family and column qualifier level. */ - @Test(timeout = 300000) + @Test public void testPostGrantAndRevokeScanAction() throws Exception { AccessTestAction scanTableActionForGroupWithTableLevelAccess = new AccessTestAction() { @Override @@ -486,7 +486,7 @@ public class TestAccessController2 extends SecureTestUtil { public static class MyAccessController extends AccessController { } - @Test (timeout=180000) + @Test public void testCoprocessorLoading() throws Exception { MasterCoprocessorHost cpHost = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterCoprocessorHost(); @@ -500,7 +500,7 @@ public class TestAccessController2 extends SecureTestUtil { ACCESS_CONTROLLER, Coprocessor.PRIORITY_HIGHEST, 1, conf); } - @Test (timeout=180000) + @Test public void testACLZNodeDeletion() throws Exception { String baseAclZNode = "/hbase/acl/"; String ns = "testACLZNodeDeletionNamespace"; http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java index 54cf79d..ec741fb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java @@ -148,7 +148,7 @@ public class TestCellACLs extends SecureTestUtil { Threads.sleep(1000); } - @Test (timeout=120000) + @Test public void testCellPermissions() throws Exception { // store two sets of values, one store with a cell level ACL, and one without verifyAllowed(new AccessTestAction() { @@ -375,7 +375,7 @@ public class TestCellACLs extends SecureTestUtil { * Insure we are not granting access in the absence of any cells found * when scanning for covered cells. */ - @Test (timeout=120000) + @Test public void testCoveringCheck() throws Exception { // Grant read access to USER_OTHER grantOnTable(TEST_UTIL, USER_OTHER.getShortName(), TEST_TABLE.getTableName(), TEST_FAMILY, http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java index 7a5232a..ce8e2eb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java @@ -1153,7 +1153,7 @@ public class TestVisibilityLabelsWithDeletes extends VisibilityLabelsWithDeletes } } - @Test(timeout = 180000) + @Test public void testDeleteColumnWithLatestTimeStampWhenNoVersionMatches() throws Exception { setAuths(); final TableName tableName = TableName.valueOf(testName.getMethodName()); @@ -1874,7 +1874,7 @@ public class TestVisibilityLabelsWithDeletes extends VisibilityLabelsWithDeletes } } - @Test(timeout = 180000) + @Test public void testSpecificDeletesFollowedByDeleteFamily() throws Exception { setAuths(); final TableName tableName = TableName.valueOf(testName.getMethodName()); @@ -1961,7 +1961,7 @@ public class TestVisibilityLabelsWithDeletes extends VisibilityLabelsWithDeletes } } - @Test(timeout = 180000) + @Test public void testSpecificDeletesFollowedByDeleteFamily1() throws Exception { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestWithDisabledAuthorization.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestWithDisabledAuthorization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestWithDisabledAuthorization.java index 8335908..8b393bc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestWithDisabledAuthorization.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestWithDisabledAuthorization.java @@ -122,7 +122,7 @@ public class TestWithDisabledAuthorization { TEST_UTIL.shutdownMiniCluster(); } - @Test (timeout=180000) + @Test public void testManageUserAuths() throws Throwable { // Even though authorization is disabled, we should be able to manage user auths @@ -200,7 +200,7 @@ public class TestWithDisabledAuthorization { assertEquals(0, authsList.size()); } - @Test (timeout=180000) + @Test public void testPassiveVisibility() throws Exception { // No values should be filtered regardless of authorization if we are passive try (Table t = createTableAndWriteDataWithLabels( http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java index d84297f..de58fe5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java @@ -106,7 +106,7 @@ public class TestRegionSnapshotTask { * not be moved around if a snapshot operation is in progress. * See HBASE-18398 */ - @Test(timeout = 30000) + @Test public void testAddRegionWithCompactions() throws Exception { final TableName tableName = TableName.valueOf("test_table"); Table table = setupTable(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java index 9899b7b..2f6c66f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotClientRetries.java @@ -67,7 +67,7 @@ public class TestSnapshotClientRetries { TEST_UTIL.shutdownMiniCluster(); } - @Test(timeout = 60000, expected=SnapshotExistsException.class) + @Test(expected=SnapshotExistsException.class) public void testSnapshotAlreadyExist() throws Exception { final String snapshotName = "testSnapshotAlreadyExist"; TEST_UTIL.createTable(TEST_TABLE.getTableName(), "f"); @@ -75,7 +75,7 @@ public class TestSnapshotClientRetries { snapshotAndAssertOneRetry(snapshotName, TEST_TABLE.getTableName()); } - @Test(timeout = 60000, expected=SnapshotDoesNotExistException.class) + @Test(expected=SnapshotDoesNotExistException.class) public void testCloneNonExistentSnapshot() throws Exception { final String snapshotName = "testCloneNonExistentSnapshot"; cloneAndAssertOneRetry(snapshotName, TEST_TABLE.getTableName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java index e744394..9da82a4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java @@ -116,7 +116,7 @@ public class TestLoadIncrementalHFiles { util.shutdownMiniCluster(); } - @Test(timeout = 120000) + @Test public void testSimpleLoadWithMap() throws Exception { runTest("testSimpleLoadWithMap", BloomType.NONE, new byte[][][] { new byte[][] { Bytes.toBytes("aaaa"), Bytes.toBytes("cccc") }, @@ -127,14 +127,14 @@ public class TestLoadIncrementalHFiles { /** * Test case that creates some regions and loads HFiles that fit snugly inside those regions */ - @Test(timeout = 120000) + @Test public void testSimpleLoad() throws Exception { runTest("testSimpleLoad", BloomType.NONE, new byte[][][] { new byte[][] { Bytes.toBytes("aaaa"), Bytes.toBytes("cccc") }, new byte[][] { Bytes.toBytes("ddd"), Bytes.toBytes("ooo") }, }); } - @Test(timeout = 120000) + @Test public void testSimpleLoadWithFileCopy() throws Exception { String testName = tn.getMethodName(); final byte[] TABLE_NAME = Bytes.toBytes("mytable_" + testName); @@ -147,7 +147,7 @@ public class TestLoadIncrementalHFiles { /** * Test case that creates some regions and loads HFiles that cross the boundaries of those regions */ - @Test(timeout = 120000) + @Test public void testRegionCrossingLoad() throws Exception { runTest("testRegionCrossingLoad", BloomType.NONE, new byte[][][] { new byte[][] { Bytes.toBytes("aaaa"), Bytes.toBytes("eee") }, @@ -157,7 +157,7 @@ public class TestLoadIncrementalHFiles { /** * Test loading into a column family that has a ROW bloom filter. */ - @Test(timeout = 60000) + @Test public void testRegionCrossingRowBloom() throws Exception { runTest("testRegionCrossingLoadRowBloom", BloomType.ROW, new byte[][][] { new byte[][] { Bytes.toBytes("aaaa"), Bytes.toBytes("eee") }, @@ -167,7 +167,7 @@ public class TestLoadIncrementalHFiles { /** * Test loading into a column family that has a ROWCOL bloom filter. */ - @Test(timeout = 120000) + @Test public void testRegionCrossingRowColBloom() throws Exception { runTest("testRegionCrossingLoadRowColBloom", BloomType.ROWCOL, new byte[][][] { new byte[][] { Bytes.toBytes("aaaa"), Bytes.toBytes("eee") }, @@ -178,7 +178,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that have different region boundaries than * the table pre-split. */ - @Test(timeout = 120000) + @Test public void testSimpleHFileSplit() throws Exception { runTest("testHFileSplit", BloomType.NONE, new byte[][] { Bytes.toBytes("aaa"), Bytes.toBytes("fff"), Bytes.toBytes("jjj"), @@ -191,7 +191,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that cross the boundaries and have * different region boundaries than the table pre-split. */ - @Test(timeout = 60000) + @Test public void testRegionCrossingHFileSplit() throws Exception { testRegionCrossingHFileSplit(BloomType.NONE); } @@ -200,7 +200,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that cross the boundaries have a ROW bloom * filter and a different region boundaries than the table pre-split. */ - @Test(timeout = 120000) + @Test public void testRegionCrossingHFileSplitRowBloom() throws Exception { testRegionCrossingHFileSplit(BloomType.ROW); } @@ -209,7 +209,7 @@ public class TestLoadIncrementalHFiles { * Test case that creates some regions and loads HFiles that cross the boundaries have a ROWCOL * bloom filter and a different region boundaries than the table pre-split. */ - @Test(timeout = 120000) + @Test public void testRegionCrossingHFileSplitRowColBloom() throws Exception { testRegionCrossingHFileSplit(BloomType.ROWCOL); } @@ -412,7 +412,7 @@ public class TestLoadIncrementalHFiles { * "hbase.client.rpc.codec" = KeyValueCodecWithTags so that the client can get tags in the * responses. */ - @Test(timeout = 60000) + @Test public void testTagsSurviveBulkLoadSplit() throws Exception { Path dir = util.getDataTestDirOnTestFS(tn.getMethodName()); FileSystem fs = util.getTestFileSystem(); @@ -451,7 +451,7 @@ public class TestLoadIncrementalHFiles { /** * Test loading into a column family that does not exist. */ - @Test(timeout = 60000) + @Test public void testNonexistentColumnFamilyLoad() throws Exception { String testName = tn.getMethodName(); byte[][][] hFileRanges = @@ -480,12 +480,12 @@ public class TestLoadIncrementalHFiles { } } - @Test(timeout = 120000) + @Test public void testNonHfileFolderWithUnmatchedFamilyName() throws Exception { testNonHfileFolder("testNonHfileFolderWithUnmatchedFamilyName", true); } - @Test(timeout = 120000) + @Test public void testNonHfileFolder() throws Exception { testNonHfileFolder("testNonHfileFolder", false); } @@ -549,7 +549,7 @@ public class TestLoadIncrementalHFiles { } } - @Test(timeout = 120000) + @Test public void testSplitStoreFile() throws IOException { Path dir = util.getDataTestDirOnTestFS("testSplitHFile"); FileSystem fs = util.getTestFileSystem(); @@ -634,7 +634,7 @@ public class TestLoadIncrementalHFiles { map.put(last, value - 1); } - @Test(timeout = 120000) + @Test public void testInferBoundaries() { TreeMap<byte[], Integer> map = new TreeMap<>(Bytes.BYTES_COMPARATOR); @@ -696,7 +696,7 @@ public class TestLoadIncrementalHFiles { } } - @Test(timeout = 60000) + @Test public void testLoadTooMayHFiles() throws Exception { Path dir = util.getDataTestDirOnTestFS("testLoadTooMayHFiles"); FileSystem fs = util.getTestFileSystem(); @@ -730,7 +730,7 @@ public class TestLoadIncrementalHFiles { loader.run(args); } - @Test(timeout = 120000) + @Test public void testTableWithCFNameStartWithUnderScore() throws Exception { Path dir = util.getDataTestDirOnTestFS("cfNameStartWithUnderScore"); FileSystem fs = util.getTestFileSystem(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java index b9c2d18..7e051b3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java @@ -277,7 +277,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * Test that shows that exception thrown from the RS side will result in an exception on the * LIHFile client. */ - @Test(expected = IOException.class, timeout = 120000) + @Test(expected = IOException.class) public void testBulkLoadPhaseFailure() throws Exception { final TableName table = TableName.valueOf(name.getMethodName()); final AtomicInteger attmptedCalls = new AtomicInteger(); @@ -391,7 +391,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * atomic bulk load call. We cannot use presplitting to test this path, so we actually inject a * split just before the atomic region load. */ - @Test(timeout = 120000) + @Test public void testSplitWhileBulkLoadPhase() throws Exception { final TableName table = TableName.valueOf(name.getMethodName()); try (Connection connection = ConnectionFactory.createConnection(util.getConfiguration())) { @@ -437,7 +437,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * This test splits a table and attempts to bulk load. The bulk import files should be split * before atomically importing. */ - @Test(timeout = 120000) + @Test public void testGroupOrSplitPresplit() throws Exception { final TableName table = TableName.valueOf(name.getMethodName()); try (Connection connection = ConnectionFactory.createConnection(util.getConfiguration())) { @@ -477,7 +477,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { * This test creates a table with many small regions. The bulk load files would be splitted * multiple times before all of them can be loaded successfully. */ - @Test(timeout = 120000) + @Test public void testSplitTmpFileCleanUp() throws Exception { final TableName table = TableName.valueOf(name.getMethodName()); byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000010"), @@ -512,7 +512,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { /** * This simulates an remote exception which should cause LIHF to exit with an exception. */ - @Test(expected = IOException.class, timeout = 120000) + @Test(expected = IOException.class) public void testGroupOrSplitFailure() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); try (Connection connection = ConnectionFactory.createConnection(util.getConfiguration())) { @@ -546,7 +546,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { fail("doBulkLoad should have thrown an exception"); } - @Test(timeout = 120000) + @Test public void testGroupOrSplitWhenRegionHoleExistsInMeta() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000100") }; http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestSecureLoadIncrementalHFilesSplitRecovery.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestSecureLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestSecureLoadIncrementalHFilesSplitRecovery.java index 20e76be..7fe79a9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestSecureLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestSecureLoadIncrementalHFilesSplitRecovery.java @@ -65,7 +65,7 @@ public class TestSecureLoadIncrementalHFilesSplitRecovery } // Disabling this test as it does not work in secure mode - @Test(timeout = 180000) + @Test @Override public void testBulkLoadPhaseFailure() { } http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java index 9639af0..e8bbf7b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java @@ -206,7 +206,7 @@ public class TestBoundedPriorityBlockingQueue { assertNull(null, queue.poll()); } - @Test(timeout=10000) + @Test public void testPollInExecutor() throws InterruptedException { final TestObject testObj = new TestObject(0, 0); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckMOB.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckMOB.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckMOB.java index 3c52658..85ab16d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckMOB.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckMOB.java @@ -100,7 +100,7 @@ public class TestHBaseFsckMOB extends BaseTestHBaseFsck { /** * This creates a table and then corrupts a mob file. Hbck should quarantine the file. */ - @Test(timeout=180000) + @Test public void testQuarantineCorruptMobFile() throws Exception { TableName table = TableName.valueOf(name.getMethodName()); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java index 51f518a..8b0b348 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java @@ -115,7 +115,7 @@ public class TestIdReadWriteLock { } - @Test(timeout = 60000) + @Test public void testMultipleClients() throws Exception { ExecutorService exec = Executors.newFixedThreadPool(NUM_THREADS); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java index d318eec..c150196 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java @@ -48,7 +48,7 @@ public class TestMiniClusterLoadParallel } @Override - @Test(timeout=TIMEOUT_MS) + @Test public void loadTest() throws Exception { prepareForLoadTest(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java index 9bcad72..a7f1409 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java @@ -131,7 +131,7 @@ public class TestMiniClusterLoadSequential { return writer; } - @Test(timeout=TIMEOUT_MS) + @Test public void loadTest() throws Exception { prepareForLoadTest(); runLoadTestOnExistingTable(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover.java index e92b027..fb9ee84 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover.java @@ -176,7 +176,7 @@ public class TestRegionMover { /** * Test that loading the same region set doesn't cause timeout loop during meta load. */ - @Test(timeout = 30000) + @Test public void testRepeatedLoad() throws Exception { MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); HRegionServer regionServer = cluster.getRegionServer(0); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java index c391601..66d2c94 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java @@ -368,7 +368,7 @@ public class TestWALFactory { * [FSNamesystem.nextGenerationStampForBlock]) * 3. HDFS-142 (on restart, maintain pendingCreates) */ - @Test (timeout=300000) + @Test public void testAppendClose() throws Exception { TableName tableName = TableName.valueOf(currentTest.getMethodName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java index 011c9ed..f5800df 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java @@ -223,7 +223,7 @@ public class TestWALSplit { * @throws IOException * @throws InterruptedException */ - @Test (timeout=300000) + @Test public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException { final AtomicLong counter = new AtomicLong(0); AtomicBoolean stop = new AtomicBoolean(false); @@ -378,7 +378,7 @@ public class TestWALSplit { /** * {@see https://issues.apache.org/jira/browse/HBASE-3020} */ - @Test (timeout=300000) + @Test public void testRecoveredEditsPathForMeta() throws IOException { byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(); Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME); @@ -400,7 +400,7 @@ public class TestWALSplit { * Test old recovered edits file doesn't break WALSplitter. * This is useful in upgrading old instances. */ - @Test (timeout=300000) + @Test public void testOldRecoveredEditsFileSidelined() throws IOException { byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(); Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME); @@ -429,7 +429,7 @@ public class TestWALSplit { fs.initialize(fs.getUri(), conf); } - @Test (timeout=300000) + @Test public void testSplitPreservesEdits() throws IOException{ final String REGION = "region__1"; REGIONS.clear(); @@ -445,7 +445,7 @@ public class TestWALSplit { assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0])); } - @Test (timeout=300000) + @Test public void testSplitRemovesRegionEventsEdits() throws IOException{ final String REGION = "region__1"; REGIONS.clear(); @@ -464,7 +464,7 @@ public class TestWALSplit { } - @Test (timeout=300000) + @Test public void testSplitLeavesCompactionEventsEdits() throws IOException{ RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build(); REGIONS.clear(); @@ -518,12 +518,12 @@ public class TestWALSplit { return result; } - @Test (timeout=300000) + @Test public void testEmptyLogFiles() throws IOException { testEmptyLogFiles(true); } - @Test (timeout=300000) + @Test public void testEmptyOpenLogFiles() throws IOException { testEmptyLogFiles(false); } @@ -538,14 +538,14 @@ public class TestWALSplit { splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty } - @Test (timeout=300000) + @Test public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException { // generate logs but leave wal.dat.5 open. generateWALs(5); splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); } - @Test (timeout=300000) + @Test public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, true); generateWALs(Integer.MAX_VALUE); @@ -554,7 +554,7 @@ public class TestWALSplit { splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); } - @Test (timeout=300000) + @Test public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, true); generateWALs(Integer.MAX_VALUE); @@ -563,7 +563,7 @@ public class TestWALSplit { splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt } - @Test (timeout=300000) + @Test public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, true); generateWALs(Integer.MAX_VALUE); @@ -579,7 +579,7 @@ public class TestWALSplit { REGIONS.size() * (goodEntries + firstHalfEntries) <= allRegionsCount); } - @Test(timeout = 300000) + @Test public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, true); List<FaultyProtobufLogReader.FailureType> failureTypes = Arrays @@ -645,14 +645,14 @@ public class TestWALSplit { } } - @Test (timeout=300000, expected = IOException.class) + @Test (expected = IOException.class) public void testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, false); splitCorruptWALs(FaultyProtobufLogReader.FailureType.BEGINNING); } - @Test (timeout=300000) + @Test public void testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, false); @@ -697,19 +697,19 @@ public class TestWALSplit { } - @Test (timeout=300000) + @Test public void testEOFisIgnored() throws IOException { int entryCount = 10; ignoreCorruption(Corruptions.TRUNCATE, entryCount, entryCount-1); } - @Test (timeout=300000) + @Test public void testCorruptWALTrailer() throws IOException { int entryCount = 10; ignoreCorruption(Corruptions.TRUNCATE_TRAILER, entryCount, entryCount); } - @Test (timeout=300000) + @Test public void testLogsGetArchivedAfterSplit() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, false); generateWALs(-1); @@ -719,13 +719,13 @@ public class TestWALSplit { assertEquals("wrong number of files in the archive log", NUM_WRITERS, archivedLogs.length); } - @Test (timeout=300000) + @Test public void testSplit() throws IOException { generateWALs(-1); splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); } - @Test (timeout=300000) + @Test public void testLogDirectoryShouldBeDeletedAfterSuccessfulSplit() throws IOException { generateWALs(-1); @@ -743,7 +743,7 @@ public class TestWALSplit { } } - @Test(timeout=300000, expected = IOException.class) + @Test(expected = IOException.class) public void testSplitWillFailIfWritingToRegionFails() throws Exception { //leave 5th log open so we could append the "trap" Writer writer = generateWALs(4); @@ -770,7 +770,7 @@ public class TestWALSplit { } } - @Test (timeout=300000) + @Test public void testSplitDeletedRegion() throws IOException { REGIONS.clear(); String region = "region_that_splits"; @@ -785,7 +785,7 @@ public class TestWALSplit { assertFalse(fs.exists(regiondir)); } - @Test (timeout=300000) + @Test public void testIOEOnOutputThread() throws Exception { conf.setBoolean(HBASE_SKIP_ERRORS, false); @@ -867,7 +867,7 @@ public class TestWALSplit { } // Test for HBASE-3412 - @Test (timeout=300000) + @Test public void testMovedWALDuringRecovery() throws Exception { // This partial mock will throw LEE for every file simulating // files that were moved @@ -879,7 +879,7 @@ public class TestWALSplit { retryOverHdfsProblem(spiedFs); } - @Test (timeout=300000) + @Test public void testRetryOpenDuringRecovery() throws Exception { FileSystem spiedFs = Mockito.spy(fs); // The "Cannot obtain block length", "Could not obtain the last block", @@ -908,7 +908,7 @@ public class TestWALSplit { retryOverHdfsProblem(spiedFs); } - @Test (timeout=300000) + @Test public void testTerminationAskedByReporter() throws IOException, CorruptedLogFileException { generateWALs(1, 10, -1); FileStatus logfile = fs.listStatus(WALDIR)[0]; @@ -952,7 +952,7 @@ public class TestWALSplit { * Test log split process with fake data and lots of edits to trigger threading * issues. */ - @Test (timeout=300000) + @Test public void testThreading() throws Exception { doTestThreading(20000, 128*1024*1024, 0); } @@ -961,7 +961,7 @@ public class TestWALSplit { * Test blocking behavior of the log split process if writers are writing slower * than the reader is reading. */ - @Test (timeout=300000) + @Test public void testThreadingSlowWriterSmallBuffer() throws Exception { doTestThreading(200, 1024, 50); } @@ -1069,7 +1069,7 @@ public class TestWALSplit { } // Does leaving the writer open in testSplitDeletedRegion matter enough for two tests? - @Test (timeout=300000) + @Test public void testSplitLogFileDeletedRegionDir() throws IOException { LOG.info("testSplitLogFileDeletedRegionDir"); final String REGION = "region__1"; @@ -1086,7 +1086,7 @@ public class TestWALSplit { assertFalse(fs.exists(regiondir)); } - @Test (timeout=300000) + @Test public void testSplitLogFileEmpty() throws IOException { LOG.info("testSplitLogFileEmpty"); // we won't create the hlog dir until getWAL got called, so @@ -1102,14 +1102,14 @@ public class TestWALSplit { assertEquals(0, countWAL(fs.listStatus(OLDLOGDIR)[0].getPath())); } - @Test (timeout=300000) + @Test public void testSplitLogFileMultipleRegions() throws IOException { LOG.info("testSplitLogFileMultipleRegions"); generateWALs(1, 10, -1); splitAndCount(1, 10); } - @Test (timeout=300000) + @Test public void testSplitLogFileFirstLineCorruptionLog() throws IOException { conf.setBoolean(HBASE_SKIP_ERRORS, true); @@ -1129,7 +1129,7 @@ public class TestWALSplit { /** * {@see https://issues.apache.org/jira/browse/HBASE-4862} */ - @Test (timeout=300000) + @Test public void testConcurrentSplitLogAndReplayRecoverEdit() throws IOException { LOG.info("testConcurrentSplitLogAndReplayRecoverEdit"); // Generate wals for our destination region http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.java index eed09c7..3ca584a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.java @@ -42,7 +42,7 @@ public class TestWALSplitBoundedLogWriterCreation extends TestWALSplit{ * The logic of this test has conflict with the limit writers split logic, skip this test */ @Override - @Test(timeout=300000) + @Test @Ignore public void testThreadingSlowWriterSmallBuffer() throws Exception { super.testThreadingSlowWriterSmallBuffer(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java index 0580cda..993cf7f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java @@ -127,7 +127,7 @@ public class TestZooKeeperACL { * then check the subset of world-readable nodes in the three tests after * that. */ - @Test (timeout=30000) + @Test public void testHBaseRootZNodeACL() throws Exception { if (!secureZKAvailable) { return; @@ -146,7 +146,7 @@ public class TestZooKeeperACL { * should be created with 2 ACLs: one specifies that the hbase user has * full access to the node; the other, that it is world-readable. */ - @Test (timeout=30000) + @Test public void testHBaseRootRegionServerZNodeACL() throws Exception { if (!secureZKAvailable) { return; @@ -183,7 +183,7 @@ public class TestZooKeeperACL { * created with 2 ACLs: one specifies that the hbase user has full access * to the node; the other, that it is world-readable. */ - @Test (timeout=30000) + @Test public void testHBaseMasterServerZNodeACL() throws Exception { if (!secureZKAvailable) { return; @@ -219,7 +219,7 @@ public class TestZooKeeperACL { * created with 2 ACLs: one specifies that the hbase user has full access * to the node; the other, that it is world-readable. */ - @Test (timeout=30000) + @Test public void testHBaseIDZNodeACL() throws Exception { if (!secureZKAvailable) { return; @@ -325,7 +325,7 @@ public class TestZooKeeperACL { } } - @Test(timeout = 10000) + @Test public void testAdminDrainAllowedOnSecureZK() throws Exception { if (!secureZKAvailable) { return; http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java index 7e01029..c0d34b9 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java @@ -76,7 +76,7 @@ public class TestCallQueue { } - @Test(timeout = 60000) + @Test public void testPutTake() throws Exception { ThriftMetrics metrics = createMetrics(); CallQueue callQueue = new CallQueue(new LinkedBlockingQueue<>(), metrics); @@ -89,7 +89,7 @@ public class TestCallQueue { verifyMetrics(metrics, "timeInQueue_num_ops", elementsRemoved); } - @Test(timeout = 60000) + @Test public void testOfferPoll() throws Exception { ThriftMetrics metrics = createMetrics(); CallQueue callQueue = new CallQueue(new LinkedBlockingQueue<>(), metrics); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java index 8a9f903..bd156bc 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java @@ -133,7 +133,7 @@ public class TestThriftHttpServer { @Rule public ExpectedException exception = ExpectedException.none(); - @Test(timeout=600000) + @Test public void testRunThriftServerWithHeaderBufferLength() throws Exception { // Test thrift server with HTTP header length less than 64k @@ -149,7 +149,7 @@ public class TestThriftHttpServer { runThriftServer(1024 * 64); } - @Test(timeout=600000) + @Test public void testRunThriftServer() throws Exception { runThriftServer(0); } http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java index 26546fd..f7585db 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java @@ -153,7 +153,7 @@ public class TestThriftServerCmdLine { cmdLineThread.start(); } - @Test(timeout=600000) + @Test public void testRunThriftServer() throws Exception { List<String> args = new ArrayList<>(); if (implType != null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestInstancePending.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestInstancePending.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestInstancePending.java index 9937953..caa0beb 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestInstancePending.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestInstancePending.java @@ -33,7 +33,7 @@ public class TestInstancePending { public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestInstancePending.class); - @Test(timeout = 1000) + @Test public void test() throws Exception { final InstancePending<String> pending = new InstancePending<>(); final AtomicReference<String> getResultRef = new AtomicReference<>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8f1e01b6/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java index 7be8b2f..55e7aa8 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java @@ -81,7 +81,7 @@ public class TestZKMulti { TEST_UTIL.shutdownMiniZKCluster(); } - @Test (timeout=60000) + @Test public void testSimpleMulti() throws Exception { // null multi ZKUtil.multiOrSequential(zkw, null, false); @@ -110,7 +110,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, path) == -1); } - @Test (timeout=60000) + @Test public void testComplexMulti() throws Exception { String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti1"); String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti2"); @@ -152,7 +152,7 @@ public class TestZKMulti { assertTrue(Bytes.equals(ZKUtil.getData(zkw, path6), Bytes.toBytes(path6))); } - @Test (timeout=60000) + @Test public void testSingleFailure() throws Exception { // try to delete a node that doesn't exist boolean caughtNoNode = false; @@ -190,7 +190,7 @@ public class TestZKMulti { assertTrue(caughtNodeExists); } - @Test (timeout=60000) + @Test public void testSingleFailureInMulti() throws Exception { // try a multi where all but one operation succeeds String pathA = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureInMultiA"); @@ -213,7 +213,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, pathC) == -1); } - @Test (timeout=60000) + @Test public void testMultiFailure() throws Exception { String pathX = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureX"); String pathY = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureY"); @@ -267,7 +267,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, pathV) == -1); } - @Test (timeout=60000) + @Test public void testRunSequentialOnMultiFailure() throws Exception { String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential1"); String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential2"); @@ -300,7 +300,7 @@ public class TestZKMulti { * Verifies that for the given root node, it should delete all the child nodes * recursively using multi-update api. */ - @Test (timeout=60000) + @Test public void testdeleteChildrenRecursivelyMulti() throws Exception { String parentZNode = "/testRootMulti"; createZNodeTree(parentZNode); @@ -318,7 +318,7 @@ public class TestZKMulti { * Verifies that for the given root node, it should delete all the nodes recursively using * multi-update api. */ - @Test(timeout = 60000) + @Test public void testDeleteNodeRecursivelyMulti() throws Exception { String parentZNode = "/testdeleteNodeRecursivelyMulti"; createZNodeTree(parentZNode); @@ -327,7 +327,7 @@ public class TestZKMulti { assertTrue("Parent znode should be deleted.", ZKUtil.checkExists(zkw, parentZNode) == -1); } - @Test(timeout = 60000) + @Test public void testDeleteNodeRecursivelyMultiOrSequential() throws Exception { String parentZNode1 = "/testdeleteNode1"; String parentZNode2 = "/testdeleteNode2"; @@ -343,7 +343,7 @@ public class TestZKMulti { assertTrue("Parent znode 3 should be deleted.", ZKUtil.checkExists(zkw, parentZNode3) == -1); } - @Test(timeout = 60000) + @Test public void testDeleteChildrenRecursivelyMultiOrSequential() throws Exception { String parentZNode1 = "/testdeleteChildren1"; String parentZNode2 = "/testdeleteChildren2";
