From 449718137e7f6885be47ad5d426db02bfa117ce7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Mon, 8 Mar 2021 17:52:47 -0800 Subject: [PATCH 1/2] HDDS-4921. Replace the usage of deprecated Junit#timeout() in Ozone. --- .../apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java | 2 +- .../org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java | 4 ++-- .../org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java | 2 +- .../org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java | 2 +- .../hadoop/ozone/container/common/helpers/TestBlockData.java | 2 +- .../ozone/container/common/impl/TestContainerPersistence.java | 2 +- .../hadoop/ozone/container/common/interfaces/TestHandler.java | 2 +- .../ozone/container/common/volume/TestHddsVolumeChecker.java | 2 +- .../hadoop/ozone/container/common/volume/TestVolumeSet.java | 2 +- .../container/common/volume/TestVolumeSetDiskChecks.java | 2 +- .../keyvalue/TestKeyValueContainerMarkUnhealthy.java | 2 +- .../hadoop/ozone/container/keyvalue/TestKeyValueHandler.java | 2 +- .../java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java | 2 +- .../java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java | 2 +- .../hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java | 2 +- .../hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java | 2 +- .../org/apache/hadoop/ozone/client/TestHddsClientUtils.java | 2 +- .../src/test/java/org/apache/hadoop/ozone/TestOmUtils.java | 2 +- .../org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java | 2 +- .../hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 2 +- .../org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java | 2 +- .../java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java | 2 +- .../apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java | 2 +- .../java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 2 +- .../org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 2 +- .../apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java | 2 +- .../scm/container/metrics/TestSCMContainerManagerMetrics.java | 2 +- .../apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java | 2 +- .../org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java | 2 +- .../apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java | 2 +- .../org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java | 2 +- .../java/org/apache/hadoop/ozone/TestContainerOperations.java | 2 +- .../hadoop/ozone/TestContainerStateMachineIdempotency.java | 2 +- .../java/org/apache/hadoop/ozone/TestDelegationToken.java | 2 +- .../java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java | 2 +- .../java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java | 2 +- .../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 2 +- .../java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java | 2 +- .../org/apache/hadoop/ozone/TestStorageContainerManager.java | 2 +- .../hadoop/ozone/TestStorageContainerManagerHelper.java | 2 +- .../apache/hadoop/ozone/client/rpc/Test2WayCommitInRatis.java | 2 +- .../java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java | 2 +- .../apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java | 2 +- .../ozone/client/rpc/TestBlockOutputStreamFlushDelay.java | 2 +- .../ozone/client/rpc/TestBlockOutputStreamWithFailures.java | 2 +- .../rpc/TestBlockOutputStreamWithFailuresFlushDelay.java | 2 +- .../ozone/client/rpc/TestCloseContainerHandlingByClient.java | 2 +- .../org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java | 2 +- .../hadoop/ozone/client/rpc/TestContainerStateMachine.java | 2 +- .../ozone/client/rpc/TestContainerStateMachineFlushDelay.java | 2 +- .../ozone/client/rpc/TestDiscardPreallocatedBlocks.java | 2 +- .../hadoop/ozone/client/rpc/TestFailureHandlingByClient.java | 2 +- .../client/rpc/TestFailureHandlingByClientFlushDelay.java | 2 +- .../hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java | 2 +- .../apache/hadoop/ozone/client/rpc/TestKeyInputStream.java | 4 +--- .../ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java | 2 +- .../rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java | 2 +- .../ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java | 2 +- .../apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java | 2 +- .../org/apache/hadoop/ozone/client/rpc/TestReadRetries.java | 2 +- .../hadoop/ozone/container/TestContainerReplication.java | 2 +- .../commandhandler/TestCloseContainerHandler.java | 2 +- .../commandhandler/TestDeleteContainerHandler.java | 2 +- .../hadoop/ozone/container/metrics/TestContainerMetrics.java | 2 +- .../hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java | 2 +- .../ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java | 2 +- .../ozone/container/ozoneimpl/TestSecureOzoneContainer.java | 2 +- .../apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java | 2 +- .../org/apache/hadoop/ozone/dn/scrubber/TestDataScrubber.java | 2 +- .../ozone/freon/TestDataValidateWithDummyContainers.java | 2 +- .../ozone/freon/TestDataValidateWithSafeByteOperations.java | 2 +- .../ozone/freon/TestDataValidateWithUnsafeByteOperations.java | 2 +- .../hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java | 2 +- .../hadoop/ozone/freon/TestFreonWithDatanodeRestart.java | 2 +- .../org/apache/hadoop/ozone/fsck/TestContainerMapper.java | 2 +- .../apache/hadoop/ozone/om/TestContainerReportWithKeys.java | 2 +- .../java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java | 2 +- .../test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java | 2 +- .../org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java | 2 +- .../org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java | 2 +- .../src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java | 2 +- .../org/apache/hadoop/ozone/om/TestOmBlockVersioning.java | 2 +- .../src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java | 2 +- .../test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java | 2 +- .../apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java | 2 +- .../java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java | 2 +- .../apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java | 2 +- .../apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java | 2 +- .../org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java | 2 +- .../hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java | 2 +- .../test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java | 2 +- .../org/apache/hadoop/ozone/om/TestSecureOzoneManager.java | 2 +- .../apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java | 2 +- .../ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java | 2 +- .../org/apache/hadoop/ozone/recon/TestReconAsPassiveScm.java | 2 +- .../java/org/apache/hadoop/ozone/recon/TestReconTasks.java | 2 +- .../apache/hadoop/ozone/recon/TestReconWithOzoneManager.java | 2 +- .../hadoop/ozone/recon/TestReconWithOzoneManagerHA.java | 2 +- .../org/apache/hadoop/ozone/scm/TestAllocateContainer.java | 2 +- .../org/apache/hadoop/ozone/scm/TestContainerSmallFile.java | 2 +- .../ozone/scm/TestGetCommittedBlockLengthAndPutKey.java | 2 +- .../test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java | 2 +- .../org/apache/hadoop/ozone/scm/TestSCMNodeManagerMXBean.java | 2 +- .../org/apache/hadoop/ozone/scm/TestXceiverClientManager.java | 2 +- .../org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java | 2 +- .../hadoop/ozone/scm/pipeline/TestPipelineManagerMXBean.java | 2 +- .../scm/pipeline/TestSCMPipelineBytesWrittenMetrics.java | 2 +- .../hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java | 2 +- .../org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java | 2 +- .../java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 2 +- 110 files changed, 111 insertions(+), 113 deletions(-) diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java index 37df09e8de41..a217c61d8560 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java @@ -72,7 +72,7 @@ public TestNetworkTopologyImpl(NodeSchema[] schemas, Node[] nodeArray) { } @Rule - public Timeout testTimeout = new Timeout(3000000); + public Timeout testTimeout = Timeout.seconds(300); @Parameters public static Collection setupDatanodes() { diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java index aa65737365e3..c00aae98cd16 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java @@ -48,7 +48,7 @@ public static class ParameterizedTests { private final String errMsg; @Rule - public Timeout testTimeout = new Timeout(2000); + public Timeout testTimeout = Timeout.seconds(2); @Parameters public static Collection getSchemaFiles() { @@ -98,7 +98,7 @@ public static class NonParameterizedTests { private static final String VALID_SCHEMA_FILE = "good.xml"; @Rule - public Timeout testTimeout = new Timeout(2000); + public Timeout testTimeout = Timeout.seconds(2); @Test public void testGood() throws Exception { diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java index ae971559b673..572efb8b5ba8 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java @@ -50,7 +50,7 @@ public TestNodeSchemaManager() { } @Rule - public Timeout testTimeout = new Timeout(30000); + public Timeout testTimeout = Timeout.seconds(300); @Test(expected = IllegalArgumentException.class) public void testFailure1() { diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java index c38bf388363c..9729d0e392f0 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java @@ -52,7 +52,7 @@ public TestYamlSchemaLoader(String schemaFile, String errMsg) { } @Rule - public Timeout testTimeout = new Timeout(30000); + public Timeout testTimeout = Timeout.seconds(30); @Parameters public static Collection getSchemaFiles() { diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java index a012824455e5..802817bbb9f7 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java @@ -40,7 +40,7 @@ public class TestBlockData { static final Logger LOG = LoggerFactory.getLogger(TestBlockData.class); @Rule - public TestRule timeout = new Timeout(10000); + public TestRule timeout = Timeout.seconds(10); static ContainerProtos.ChunkInfo buildChunkInfo(String name, long offset, long len) { diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java index cc9bf46d6367..de88fb97aef3 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java @@ -111,7 +111,7 @@ public class TestContainerPersistence { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); private final ChunkLayOutVersion layout; diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java index 81581f199674..f969148a1603 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java @@ -48,7 +48,7 @@ */ public class TestHandler { @Rule - public TestRule timeout = new Timeout(300000); + public TestRule timeout = Timeout.seconds(300); private OzoneConfiguration conf; private HddsDispatcher dispatcher; diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolumeChecker.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolumeChecker.java index e4cd60fb419e..8dfc009053b2 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolumeChecker.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolumeChecker.java @@ -88,7 +88,7 @@ public class TestHddsVolumeChecker { public TestName testName = new TestName(); @Rule - public Timeout globalTimeout = new Timeout(30_000); + public Timeout globalTimeout = Timeout.seconds(30); private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java index 7d07dc6c45ef..8a6114088cc6 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java @@ -68,7 +68,7 @@ private void initializeVolumeSet() throws Exception { } @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); @Before public void setup() throws Exception { diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java index 3bd42d89fba5..08ddb7be6369 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java @@ -58,7 +58,7 @@ public class TestVolumeSetDiskChecks { TestVolumeSetDiskChecks.class); @Rule - public Timeout globalTimeout = new Timeout(30_000); + public Timeout globalTimeout = Timeout.seconds(30); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java index ef78fcca4e26..185d879717de 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java @@ -66,7 +66,7 @@ public class TestKeyValueContainerMarkUnhealthy { public TemporaryFolder folder = new TemporaryFolder(); @Rule - public Timeout timeout = new Timeout(600_000); + public Timeout timeout = Timeout.seconds(600); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java index a89bd178544e..434e93a8c8f2 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java @@ -74,7 +74,7 @@ public class TestKeyValueHandler { @Rule - public TestRule timeout = new Timeout(300000); + public TestRule timeout = Timeout.seconds(300); private static final String DATANODE_UUID = UUID.randomUUID().toString(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java index b3cb668bb62c..39aa41e2bce8 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java @@ -37,7 +37,7 @@ public class TestHddsServerUtil { @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Rule public ExpectedException thrown= ExpectedException.none(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java index 56d265a85862..2c65ee888ac2 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java @@ -51,7 +51,7 @@ public class TestHddsServerUtils { TestHddsServerUtils.class); @Rule - public Timeout timeout = new Timeout(300_000); + public Timeout timeout = Timeout.seconds(300);; @Rule public ExpectedException thrown= ExpectedException.none(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java index 45decbc6cbeb..71aac96b0be1 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java @@ -69,7 +69,7 @@ public class TestSCMSafeModeManager { private List containers = Collections.emptyList(); @Rule - public Timeout timeout = new Timeout(1000 * 300); + public Timeout timeout = Timeout.seconds(300); @Rule public final TemporaryFolder tempDir = new TemporaryFolder(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java index 8040cb4b6f7b..6b9ccbf097a4 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java @@ -34,7 +34,7 @@ public class TestSCMSecurityProtocolServer { private OzoneConfiguration config; @Rule - public Timeout timeout = new Timeout(1000 * 20); + public Timeout timeout = Timeout.seconds(20); @Before public void setUp() throws Exception { diff --git a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java index 6e1e33600c37..22206685d2fe 100644 --- a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java +++ b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java @@ -50,7 +50,7 @@ */ public class TestHddsClientUtils { @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Rule public ExpectedException thrown= ExpectedException.none(); diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/TestOmUtils.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/TestOmUtils.java index 7cb981954d1d..f02af977c8c3 100644 --- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/TestOmUtils.java +++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/TestOmUtils.java @@ -50,7 +50,7 @@ public class TestOmUtils { public TemporaryFolder folder = new TemporaryFolder(); @Rule - public Timeout timeout = new Timeout(60_000); + public Timeout timeout = Timeout.seconds(60); @Test diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java index 0d39a2bb69e5..b53a555d9c3c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java @@ -52,7 +52,7 @@ public class TestOzoneFSInputStream { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static FileSystem fs; private static Path filePath = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java index 2a9ea8785c13..a86a9aaa9b52 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java @@ -66,7 +66,7 @@ public class TestOzoneFSWithObjectStoreCreate { @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private String rootPath; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java index fbdd5d4a8c6b..ccb16f44dc69 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java @@ -84,7 +84,7 @@ public class TestOzoneFileInterfaces { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private String rootPath; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java index be383e2ac053..03a22e3899c8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java @@ -116,7 +116,7 @@ public TestOzoneFileSystem(boolean setDefaultFs, boolean enableOMRatis) { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static final Logger LOG = LoggerFactory.getLogger(TestOzoneFileSystem.class); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java index 9b619a5c99e5..4c3c95e163c6 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java @@ -49,7 +49,7 @@ public class TestOzoneFileSystemMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static FileSystem fs; private static OzoneBucket bucket; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java index 055c7877db54..baee60cf44f2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java @@ -64,7 +64,7 @@ public class TestOzoneFsHAURLs { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); public static final Logger LOG = LoggerFactory.getLogger( TestOzoneFsHAURLs.class); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java index 710c906d3747..3e123733b30a 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java @@ -111,7 +111,7 @@ public TestRootedOzoneFileSystem(boolean setDefaultFs, } @Rule - public Timeout globalTimeout = new Timeout(300_000); + public Timeout globalTimeout = Timeout.seconds(300);; private static boolean enabledFileSystemPaths; private static boolean omRatisEnabled; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java index 7c3a8a9f6ba7..6ee2b979cb7b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java @@ -66,7 +66,7 @@ public class TestSCMDbCheckpointServlet { private String omId; @Rule - public Timeout timeout = new Timeout(240000); + public Timeout timeout = Timeout.seconds(240); @Rule public TemporaryFolder folder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java index dea9a5802442..21b56787e960 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java @@ -58,7 +58,7 @@ public class TestSCMContainerManagerMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private StorageContainerManager scm; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java index 6fe2aec89fb4..bd1badc13d72 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java @@ -52,7 +52,7 @@ public class TestNode2PipelineMap { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java index 954299a51655..083ad6beed2e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java @@ -46,7 +46,7 @@ public class TestNodeFailure { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static List ratisPipelines; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java index 346fc0e7aa75..f30889127909 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java @@ -68,7 +68,7 @@ public class TestPipelineClose { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java index 3e8628fd10b9..3760e17fed07 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java @@ -50,7 +50,7 @@ public class TestSCMRestart { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java index 8d8e5853f274..f1ca3d2c015f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java @@ -43,7 +43,7 @@ public class TestContainerOperations { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static ScmClient storageClient; private static MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerStateMachineIdempotency.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerStateMachineIdempotency.java index d6afbec563d6..bbf2d673b3d1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerStateMachineIdempotency.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerStateMachineIdempotency.java @@ -58,7 +58,7 @@ public class TestContainerStateMachineIdempotency { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration ozoneConfig; private static StorageContainerLocationProtocolClientSideTranslatorPB diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java index 4df0f6618b8e..43221afa554b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDelegationToken.java @@ -108,7 +108,7 @@ public final class TestDelegationToken { .getLogger(TestDelegationToken.class); @Rule - public Timeout timeout = new Timeout(80_000); + public Timeout timeout = Timeout.seconds(80); @Rule public TemporaryFolder folder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java index 178ea6d00369..4c028bc00496 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java @@ -74,7 +74,7 @@ public class TestMiniOzoneCluster { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java index 23062757730f..f7476518de57 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java @@ -54,7 +54,7 @@ public class TestMiniOzoneHACluster { public ExpectedException exception = ExpectedException.none(); @Rule - public Timeout timeout = new Timeout(300_000); + public Timeout timeout = Timeout.seconds(300);; /** * Create a MiniOzoneHAClusterImpl for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java index edb6f2b57b62..c3ed74796b88 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java @@ -38,7 +38,7 @@ public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Override public void initializeMemberVariables() { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java index a8107e928b98..746f9f964f44 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java @@ -133,7 +133,7 @@ public final class TestSecureOzoneCluster { .getLogger(TestSecureOzoneCluster.class); @Rule - public Timeout timeout = new Timeout(80_000); + public Timeout timeout = Timeout.seconds(80); @Rule public TemporaryFolder folder= new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java index 7bccd8e9ab1a..60e3ef09f334 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java @@ -114,7 +114,7 @@ public class TestStorageContainerManager { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(900000); + public Timeout testTimeout = Timeout.seconds(900); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManagerHelper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManagerHelper.java index 37476fbecbb0..4ae03ee44c5b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManagerHelper.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManagerHelper.java @@ -59,7 +59,7 @@ public class TestStorageContainerManagerHelper { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private final MiniOzoneCluster cluster; private final OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/Test2WayCommitInRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/Test2WayCommitInRatis.java index 2b1502f75962..2599fac61c4c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/Test2WayCommitInRatis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/Test2WayCommitInRatis.java @@ -60,7 +60,7 @@ public class Test2WayCommitInRatis { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneClient client; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java index d406ba4f9da7..d51b8efea5ce 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java @@ -64,7 +64,7 @@ public class TestBCSID { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static OzoneConfiguration conf = new OzoneConfiguration(); private static MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java index f918a8b27293..4459445afdb8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java @@ -60,7 +60,7 @@ public class TestBlockOutputStream { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf = new OzoneConfiguration(); private static OzoneClient client; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java index ab12cd9b6beb..59f042965891 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java @@ -58,7 +58,7 @@ public class TestBlockOutputStreamFlushDelay { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf = new OzoneConfiguration(); private static OzoneClient client; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java index b3c7d8ef1f5e..db3c94b80365 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java @@ -69,7 +69,7 @@ public class TestBlockOutputStreamWithFailures { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailuresFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailuresFlushDelay.java index 21dde59e4e64..d88299b245c2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailuresFlushDelay.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailuresFlushDelay.java @@ -70,7 +70,7 @@ public class TestBlockOutputStreamWithFailuresFlushDelay { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java index 47bdb3e14199..76019c5762a3 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java @@ -66,7 +66,7 @@ public class TestCloseContainerHandlingByClient { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java index eecf78881f30..e03c5a9f44c9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java @@ -76,7 +76,7 @@ public class TestCommitWatcher { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); private OzoneClient client; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java index 9057b0ca7db6..f2d8b0d6dfbd 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachine.java @@ -69,7 +69,7 @@ public class TestContainerStateMachine { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java index f3bc5c104ef5..9c3e49125f00 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFlushDelay.java @@ -59,7 +59,7 @@ public class TestContainerStateMachineFlushDelay { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java index 612c5224e850..ebdc1e7324bd 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java @@ -66,7 +66,7 @@ public class TestDiscardPreallocatedBlocks{ */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf = new OzoneConfiguration(); private static OzoneClient client; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java index cc9966a77d15..94b822a408be 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java @@ -75,7 +75,7 @@ public class TestFailureHandlingByClient { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClientFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClientFlushDelay.java index c7dfacc682f5..516bb1f102d7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClientFlushDelay.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClientFlushDelay.java @@ -68,7 +68,7 @@ public class TestFailureHandlingByClientFlushDelay { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java index afe7ae4adaf9..ddf7ccdc54a7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java @@ -59,7 +59,7 @@ public class TestHybridPipelineOnDatanode { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java index 85f49776e1ba..8a81de0eb286 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestKeyInputStream.java @@ -86,8 +86,6 @@ public class TestKeyInputStream { private static final Logger LOG = LoggerFactory.getLogger(TestKeyInputStream.class); - private static final int TIMEOUT = 300_000; - private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); private OzoneClient client; @@ -166,7 +164,7 @@ public void init() throws Exception { } @Rule - public Timeout timeout = new Timeout(TIMEOUT); + public Timeout timeout = Timeout.seconds(300); /** * Shutdown MiniDFSCluster. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java index 39a81ff2f434..8f85b1450bc4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java @@ -65,7 +65,7 @@ public class TestMultiBlockWritesWithDnFailures { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java index 6c3c9047c1e3..c85c8d6fa3c2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java @@ -64,7 +64,7 @@ public class TestOzoneClientRetriesOnExceptionFlushDelay { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java index cd761d21b160..bf0cc8352f55 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java @@ -70,7 +70,7 @@ public class TestOzoneClientRetriesOnExceptions { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf = new OzoneConfiguration(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java index db4af1798507..f10d5fca4d24 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java @@ -38,7 +38,7 @@ public class TestOzoneRpcClient extends TestOzoneRpcClientAbstract { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); /** * Create a MiniOzoneCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java index af951909a74e..610753a1caf7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java @@ -71,7 +71,7 @@ public class TestReadRetries { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java index 6b88c67f851e..5755d859279e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java @@ -60,7 +60,7 @@ public class TestContainerReplication { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300);; private static final String VOLUME = "vol1"; private static final String BUCKET = "bucket1"; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java index 2aa72560f270..731c6afdee76 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java @@ -58,7 +58,7 @@ public class TestCloseContainerHandler { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java index 9440fc7828cf..fcaf006b1e54 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java @@ -64,7 +64,7 @@ public class TestDeleteContainerHandler { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java index b25d4b007bc7..fb56c8cef543 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java @@ -69,7 +69,7 @@ public class TestContainerMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Test public void testContainerMetrics() throws Exception { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java index 0fd5c089e61d..411bc3db9f25 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java @@ -55,7 +55,7 @@ public class TestOzoneContainer { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); @Rule public TemporaryFolder tempFolder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java index da99caf3d178..c025ab33678b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java @@ -74,7 +74,7 @@ public class TestOzoneContainerWithTLS { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); @Rule public TemporaryFolder tempFolder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java index 5a41bcf0d8a8..c5dd0fbc33b5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java @@ -79,7 +79,7 @@ public class TestSecureOzoneContainer { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); @Rule public TemporaryFolder tempFolder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java index dbe9598ff9c8..26e2c7fa0124 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java @@ -47,7 +47,7 @@ public class TestDnRatisLogParser { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster = null; private final ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scrubber/TestDataScrubber.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scrubber/TestDataScrubber.java index 1c856833a238..bd5926e7dee5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scrubber/TestDataScrubber.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scrubber/TestDataScrubber.java @@ -80,7 +80,7 @@ public class TestDataScrubber { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration ozoneConfig; private static OzoneClient ozClient = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java index 7415c1bebb2b..f58613963d09 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java @@ -41,7 +41,7 @@ public class TestDataValidateWithDummyContainers * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static final Logger LOG = LoggerFactory.getLogger(TestDataValidateWithDummyContainers.class); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java index 4d0070987651..846b85d7b477 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java @@ -34,7 +34,7 @@ public class TestDataValidateWithSafeByteOperations extends TestDataValidate { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java index 7db88d28df2b..544de07ca6b0 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java @@ -34,7 +34,7 @@ public class TestDataValidateWithUnsafeByteOperations extends TestDataValidate { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java index de3a7e9de35c..957c3d6fc2a8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java @@ -44,7 +44,7 @@ public class TestFreonWithDatanodeFastRestart { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java index 7a28ba59a6f2..79fa62641d5d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java @@ -48,7 +48,7 @@ public class TestFreonWithDatanodeRestart { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java index 2d1acf7aa6bd..e42ca9223a4c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/fsck/TestContainerMapper.java @@ -50,7 +50,7 @@ public class TestContainerMapper { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static OzoneClient ozClient = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestContainerReportWithKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestContainerReportWithKeys.java index a1fa79a994be..6fdee0e1e6b9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestContainerReportWithKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestContainerReportWithKeys.java @@ -58,7 +58,7 @@ public class TestContainerReportWithKeys { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static final Logger LOG = LoggerFactory.getLogger( TestContainerReportWithKeys.class); private static MiniOzoneCluster cluster = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java index 1a5954c8f646..57e431f5acc8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java @@ -129,7 +129,7 @@ public class TestKeyManagerImpl { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static PrefixManager prefixManager; private static KeyManagerImpl keyManager; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java index 2b4b471aebcf..348ef8f57f1b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java @@ -56,7 +56,7 @@ public class TestKeyPurging { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private ObjectStore store; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java index 3a90ae191d04..b6ac88d7f188 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java @@ -74,7 +74,7 @@ public class TestOMDbCheckpointServlet { private static String omId; @Rule - public Timeout timeout = new Timeout(240000); + public Timeout timeout = Timeout.seconds(240); @Rule public TemporaryFolder folder = new TemporaryFolder(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java index 19fea8544180..cc6bceb5cbf8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java @@ -59,7 +59,7 @@ public class TestOMEpochForNonRatis { private static String omId; @Rule - public Timeout timeout = new Timeout(240_000); + public Timeout timeout = Timeout.seconds(240); @BeforeClass public static void init() throws Exception { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java index 271109f0b3c7..f835abbe42af 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java @@ -54,7 +54,7 @@ public class TestOmAcls { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static boolean aclAllow = true; private static MiniOzoneCluster cluster = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java index ce673e00aeb1..01df34a5d89a 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java @@ -51,7 +51,7 @@ public class TestOmBlockVersioning { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static OzoneConfiguration conf; private static OzoneManager ozoneManager; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java index 7eb548d7a098..ea3240803d7b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java @@ -41,7 +41,7 @@ public class TestOmInit { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static OMMetrics omMetrics; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java index 7fe38ac048ad..ee7ce6b0e679 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java @@ -62,7 +62,7 @@ public class TestOmMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneManager ozoneManager; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java index 279812813c94..6b9198c9e828 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java @@ -56,7 +56,7 @@ public class TestOzoneManagerConfiguration { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private OzoneConfiguration conf; private MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java index d60366cbc58e..92afc6098549 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java @@ -86,7 +86,7 @@ public abstract class TestOzoneManagerHA { public ExpectedException exception = ExpectedException.none(); @Rule - public Timeout timeout = new Timeout(300_000); + public Timeout timeout = Timeout.seconds(300);; public MiniOzoneHAClusterImpl getCluster() { return cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java index a47aa08f2452..5d8c31b9accb 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java @@ -57,7 +57,7 @@ public class TestOzoneManagerListVolumes { @Rule - public Timeout timeout = new Timeout(120_000); + public Timeout timeout = Timeout.seconds(120); private UserGroupInformation adminUser = UserGroupInformation.createUserForTesting("om", new String[]{"ozone"}); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java index f3a92c014e57..8a0d8db1ced4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java @@ -56,7 +56,7 @@ public class TestOzoneManagerRestInterface { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java index 6ea3fa2253e4..a86b95bec208 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java @@ -62,7 +62,7 @@ public class TestOzoneManagerRestart { private static String omId; @Rule - public Timeout timeout = new Timeout(240000); + public Timeout timeout = Timeout.seconds(240); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java index 5ddde8a3a026..5499c810db46 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java @@ -42,7 +42,7 @@ public class TestOzoneManagerRocksDBLogging { private RocksDBConfiguration dbConf; @Rule - public Timeout timeout = new Timeout(100000); + public Timeout timeout = Timeout.seconds(100); private static GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer.captureLogs(DBStoreBuilder.ROCKS_DB_LOGGER); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java index 2d58ffbfda7e..aa922128be6f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java @@ -82,7 +82,7 @@ public class TestScmSafeMode { @Rule - public Timeout timeout = new Timeout(1000 * 200); + public Timeout timeout = Timeout.seconds(200); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java index 48a9c6a9ef34..a177baebc59c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java @@ -68,7 +68,7 @@ public class TestSecureOzoneManager { private Path metaDir; @Rule - public Timeout timeout = new Timeout(1000 * 25); + public Timeout timeout = Timeout.seconds(25); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java index 1aeb3e4bb2a9..c03af902b1b1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java @@ -50,7 +50,7 @@ public class TestOMRatisLogParser { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneHAClusterImpl cluster = null; private final ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java index 3e2570c6ff74..92416c152b9e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java @@ -56,7 +56,7 @@ public class TestOzoneManagerSnapshotProvider { private int numOfOMs = 3; @Rule - public Timeout timeout = new Timeout(300_000); + public Timeout timeout = Timeout.seconds(300); /** * Create a MiniDFSCluster for testing. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconAsPassiveScm.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconAsPassiveScm.java index b79eb2b22a69..1b2a915a1ecf 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconAsPassiveScm.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconAsPassiveScm.java @@ -64,7 +64,7 @@ public class TestReconAsPassiveScm { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster = null; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java index 0dd89e0ff857..14993f65e131 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java @@ -57,7 +57,7 @@ public class TestReconTasks { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster = null; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java index f799d7d01209..bcca21ee66ee 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java @@ -77,7 +77,7 @@ public class TestReconWithOzoneManager { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster = null; private static OzoneConfiguration conf; private static OMMetadataManager metadataManager; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java index 64c759b8c7eb..417cd7c140a2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java @@ -53,7 +53,7 @@ */ public class TestReconWithOzoneManagerHA { @Rule - public Timeout timeout = new Timeout(300_000); + public Timeout timeout = Timeout.seconds(300);; private MiniOzoneHAClusterImpl cluster; private ObjectStore objectStore; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java index 9c17caef62b4..e480d513d05b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java @@ -42,7 +42,7 @@ public class TestAllocateContainer { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java index 08a993f615d6..7c8ff9014a8c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java @@ -55,7 +55,7 @@ public class TestContainerSmallFile { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestGetCommittedBlockLengthAndPutKey.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestGetCommittedBlockLengthAndPutKey.java index 00aa9941d912..8bad301b0579 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestGetCommittedBlockLengthAndPutKey.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestGetCommittedBlockLengthAndPutKey.java @@ -60,7 +60,7 @@ public class TestGetCommittedBlockLengthAndPutKey { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static MiniOzoneCluster cluster; private static OzoneConfiguration ozoneConfig; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java index 057f5281e452..01d6c27cec37 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java @@ -62,7 +62,7 @@ public class TestSCMMXBean { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); public static final Log LOG = LogFactory.getLog(TestSCMMXBean.class); private static int numOfDatanodes = 3; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMNodeManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMNodeManagerMXBean.java index fd4d3db4a33d..309001c692cf 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMNodeManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMNodeManagerMXBean.java @@ -54,7 +54,7 @@ public class TestSCMNodeManagerMXBean { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); public static final Log LOG = LogFactory.getLog(TestSCMMXBean.class); private static int numOfDatanodes = 3; private static MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java index 555b5c94dc41..441fc03c325a 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java @@ -53,7 +53,7 @@ public class TestXceiverClientManager { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private OzoneConfiguration config; private MiniOzoneCluster cluster; private StorageContainerLocationProtocolClientSideTranslatorPB diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java index 44cf6544f3c6..099f33c03d9c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java @@ -61,7 +61,7 @@ public class TestXceiverClientMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); // only for testing private volatile boolean breakFlag; private CountDownLatch latch; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestPipelineManagerMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestPipelineManagerMXBean.java index 5bf39d7358cb..6b27cc9570c4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestPipelineManagerMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestPipelineManagerMXBean.java @@ -49,7 +49,7 @@ public class TestPipelineManagerMXBean { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private MBeanServer mbs; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineBytesWrittenMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineBytesWrittenMetrics.java index 4d6e6b01d4b1..51894e4bc47f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineBytesWrittenMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineBytesWrittenMetrics.java @@ -64,7 +64,7 @@ public class TestSCMPipelineBytesWrittenMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; private OzoneConfiguration conf; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java index 250a2b097e58..bb3da38afd00 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java @@ -52,7 +52,7 @@ public class TestSCMPipelineMetrics { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private MiniOzoneCluster cluster; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java index d52dd33f570f..6c89f2b7d7cb 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java @@ -49,7 +49,7 @@ public class TestOzoneDatanodeShell { * Set a timeout for each test. */ @Rule - public Timeout timeout = new Timeout(300000); + public Timeout timeout = Timeout.seconds(300); private static final Logger LOG = LoggerFactory.getLogger(TestOzoneDatanodeShell.class); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java index ae71907bedbf..a9b093c92716 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java @@ -83,7 +83,7 @@ public class TestOzoneShellHA { * Set the timeout for every test. */ @Rule - public Timeout testTimeout = new Timeout(300000); + public Timeout testTimeout = Timeout.seconds(300); private static File baseDir; private static File testFile; From aace492dfe4741b197ad3a6762c025e0d5023510 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Tue, 9 Mar 2021 11:15:26 -0800 Subject: [PATCH 2/2] address code review feedback. --- .../org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java index 572efb8b5ba8..f471745c9d4d 100644 --- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java +++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java @@ -50,7 +50,7 @@ public TestNodeSchemaManager() { } @Rule - public Timeout testTimeout = Timeout.seconds(300); + public Timeout testTimeout = Timeout.seconds(30); @Test(expected = IllegalArgumentException.class) public void testFailure1() {