This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ea808b3d07b HDDS-13903. Remove all MiniDFSCluster comments in tests
(#9274)
ea808b3d07b is described below
commit ea808b3d07b4095ccc946b15a6359c8d9e1f8fd5
Author: ChenChen Lai <[email protected]>
AuthorDate: Tue Nov 11 00:03:38 2025 +0800
HDDS-13903. Remove all MiniDFSCluster comments in tests (#9274)
---
.../java/org/apache/hadoop/hdds/scm/TestCommitInRatis.java | 11 -----------
.../org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java | 8 --------
.../apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java | 10 ----------
.../apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java | 8 --------
.../java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java | 12 ------------
.../apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java | 3 ---
.../org/apache/hadoop/hdds/scm/pipeline/TestNodeFailure.java | 9 ---------
.../apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java | 8 --------
.../org/apache/hadoop/hdds/scm/pipeline/TestSCMRestart.java | 8 --------
.../apache/hadoop/hdds/scm/storage/TestCommitWatcher.java | 10 ----------
.../java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java | 8 --------
.../apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java | 4 ----
.../java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java | 9 ---------
.../ozone/client/rpc/TestContainerReplicationEndToEnd.java | 9 ---------
.../hadoop/ozone/client/rpc/TestContainerStateMachine.java | 8 --------
.../ozone/client/rpc/TestContainerStateMachineFailures.java | 8 --------
.../client/rpc/TestContainerStateMachineFlushDelay.java | 9 ---------
.../hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java | 9 ---------
.../hadoop/ozone/client/rpc/TestECKeyOutputStream.java | 6 ------
.../hadoop/ozone/client/rpc/TestFailureHandlingByClient.java | 11 -----------
.../client/rpc/TestFailureHandlingByClientFlushDelay.java | 11 -----------
.../ozone/client/rpc/TestHybridPipelineOnDatanode.java | 10 ----------
.../ozone/client/rpc/TestMultiBlockWritesWithDnFailures.java | 11 -----------
.../rpc/TestOzoneClientRetriesOnExceptionFlushDelay.java | 11 -----------
.../ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java | 10 ----------
.../ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java | 12 ------------
.../hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java | 9 ---------
.../hadoop/ozone/container/TestECContainerRecovery.java | 6 ------
.../commandhandler/TestCloseContainerByPipeline.java | 10 ----------
.../ozone/freon/TestDataValidateWithSafeByteOperations.java | 9 ---------
.../freon/TestDataValidateWithUnsafeByteOperations.java | 9 ---------
.../hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java | 9 ---------
.../hadoop/ozone/freon/TestFreonWithPipelineDestroy.java | 9 ---------
.../org/apache/hadoop/ozone/freon/TestOMSnapshotDAG.java | 8 --------
.../org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java | 10 ----------
.../src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java | 5 -----
.../src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java | 10 ----------
.../test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java | 6 ------
.../java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java | 10 ----------
.../org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java | 11 -----------
.../hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java | 3 ---
.../java/org/apache/hadoop/ozone/om/TestScmSafeMode.java | 11 -----------
.../org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java | 3 ---
.../ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java | 6 ------
.../ozone/om/snapshot/TestSnapshotBackgroundServices.java | 8 --------
.../java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 6 ------
.../apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java | 4 ----
.../org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java | 6 ------
.../hadoop/ozone/shell/TestTransferLeadershipShell.java | 9 ---------
49 files changed, 410 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCommitInRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCommitInRatis.java
index 8e1ee32980a..c4bef01cd83 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCommitInRatis.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCommitInRatis.java
@@ -21,7 +21,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.io.IOException;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.conf.DatanodeRatisServerConfig;
@@ -62,13 +61,6 @@ public class TestCommitInRatis {
private StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
private void startCluster(OzoneConfiguration conf) throws Exception {
// Make sure the pipeline does not get destroyed quickly
conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, 60000,
@@ -106,9 +98,6 @@ private void startCluster(OzoneConfiguration conf) throws
Exception {
.getStorageContainerLocationClient();
}
- /**
- * Shutdown MiniDFSCluster.
- */
private void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
index cb9baa6855c..a4318a2cc69 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
@@ -66,11 +66,6 @@ public class TestFailoverWithSCMHA {
private static final long SNAPSHOT_THRESHOLD = 5;
- /**
- * Create a MiniOzoneCluster for testing.
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -85,9 +80,6 @@ public void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
if (cluster != null) {
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 4639b3cd697..3715d4ede36 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
@@ -79,13 +79,6 @@ public class TestSCMDbCheckpointServlet {
private String method;
private SCMDBCheckpointServlet scmDbCheckpointServletMock;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws Exception
- */
@BeforeEach
public void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -129,9 +122,6 @@ public void init() throws Exception {
.thenReturn(cluster.getStorageContainerManager());
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
index b1a9ac4afc5..4412c23402b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
@@ -77,11 +77,6 @@ public class TestSCMInstallSnapshotWithHA {
private static final long SNAPSHOT_THRESHOLD = 5;
private static final int LOG_PURGE_GAP = 5;
- /**
- * Create a MiniOzoneCluster for testing.
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -101,9 +96,6 @@ public void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java
index 79bdfc2f704..7380366e1de 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java
@@ -25,7 +25,6 @@
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.IOException;
import java.io.OutputStream;
import java.time.Duration;
import java.util.ArrayList;
@@ -92,13 +91,6 @@ public class TestWatchForCommit {
private StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -157,10 +149,6 @@ public void init() throws Exception {
.getStorageContainerLocationClient();
}
-
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
index f743ff82a24..f780ec184d2 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
@@ -67,9 +67,6 @@ public void init(int dnCount, OzoneConfiguration conf) throws
Exception {
pipelineManager = scm.getPipelineManager();
}
- /**
- * Shutdown MiniDFSCluster.
- */
public void shutdown() {
if (cluster != null) {
cluster.shutdown();
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 a4c777a15d2..f23a0bddc87 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
@@ -21,7 +21,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
-import java.io.IOException;
import java.time.Duration;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -51,11 +50,6 @@ public class TestNodeFailure {
private static final String FLOOD_TOKEN = "pipeline Action CLOSE";
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
final OzoneConfiguration conf = new OzoneConfiguration();
@@ -84,9 +78,6 @@ public static void init() throws Exception {
.getFollowerSlownessTimeout();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
if (cluster != null) {
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 1e6aa4e04bc..71666a48c23 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
@@ -85,11 +85,6 @@ public class TestPipelineClose {
private ContainerManager containerManager;
private PipelineManager pipelineManager;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -120,9 +115,6 @@ void createContainer() throws IOException {
// the other with an open container.
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public void shutdown() {
if (cluster != null) {
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 bbfd1aee8fe..431e8857490 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
@@ -48,11 +48,6 @@ public class TestSCMRestart {
private static ContainerManager newContainerManager;
private static PipelineManager pipelineManager;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
final int numOfNodes = 4;
@@ -90,9 +85,6 @@ public static void init() throws Exception {
pipelineManager =
cluster.getStorageContainerManager().getPipelineManager();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
index af2fe2a5d07..a9539a8a96b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
@@ -85,13 +85,6 @@ public class TestCommitWatcher {
private StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
// Make sure the pipeline does not get destroyed quickly
@@ -144,9 +137,6 @@ public void init() throws Exception {
.getStorageContainerLocationClient();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
index 15e101fe3bc..4b612729583 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
@@ -130,11 +130,6 @@ public class TestHDDSUpgrade {
private static MiniOzoneClusterProvider clusterProvider;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeEach
public void setUp() throws Exception {
init();
@@ -188,9 +183,6 @@ public void init() throws Exception {
loadSCMState();
}
- /**
- * Shutdown MiniDFSCluster.
- */
public void shutdown() throws IOException, InterruptedException {
if (cluster != null) {
clusterProvider.destroy(cluster);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
index 9ccc73b27af..34a5f4b7459 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
@@ -251,10 +251,6 @@ public static void initialize() throws
NoSuchAlgorithmException, UnsupportedEnco
output = GenericTestUtils.captureOut();
}
- /**
- * Create a MiniOzoneCluster for testing.
- * @param conf Configurations to start the cluster.
- */
static void startCluster(OzoneConfiguration conf) throws Exception {
startCluster(conf, MiniOzoneCluster.newBuilder(conf));
}
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 19a2752f85c..fbecc89f3ad 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
@@ -26,7 +26,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
@@ -59,11 +58,6 @@ public class TestBCSID {
private static String volumeName;
private static String bucketName;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
@@ -88,9 +82,6 @@ public static void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
index ab410c2e40c..5b89503788d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
@@ -28,7 +28,6 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
-import java.io.IOException;
import java.time.Duration;
import java.util.HashMap;
import java.util.List;
@@ -79,11 +78,6 @@ public class TestContainerReplicationEndToEnd {
private static XceiverClientManager xceiverClientManager;
private static long containerReportInterval;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -127,9 +121,6 @@ public static void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(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 2ff00d2df6f..0d269a86b2b 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
@@ -75,11 +75,6 @@ public class TestContainerStateMachine {
private String volumeName;
private String bucketName;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeEach
public void setup() throws Exception {
@@ -122,9 +117,6 @@ public void setup() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
index a788b3aa9bc..c5ff85010bd 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
@@ -123,11 +123,6 @@ public class TestContainerStateMachineFailures {
private static String bucketName;
private static XceiverClientManager xceiverClientManager;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -183,9 +178,6 @@ public static void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
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 ea1aeee9031..feb9964b084 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
@@ -27,7 +27,6 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
@@ -75,11 +74,6 @@ public class TestContainerStateMachineFlushDelay {
private String bucketName;
private String keyString;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeEach
public void setup() throws Exception {
keyString = UUID.randomUUID().toString();
@@ -123,9 +117,6 @@ public void setup() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
index 6d38fdc6c7b..1b17c8e76f3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDeleteWithInAdequateDN.java
@@ -31,7 +31,6 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.IOException;
import java.time.Duration;
import java.util.HashMap;
import java.util.List;
@@ -91,11 +90,6 @@ public class TestDeleteWithInAdequateDN {
private static XceiverClientManager xceiverClientManager;
private static final int FACTOR_THREE_PIPELINE_COUNT = 1;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
final int numOfDatanodes = 3;
@@ -169,9 +163,6 @@ public static void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java
index ad8d074ca50..7de941db569 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java
@@ -144,9 +144,6 @@ private static void initConf(OzoneConfiguration
configuration) {
.applyTo(configuration);
}
- /**
- * Create a MiniDFSCluster for testing.
- */
@BeforeAll
protected static void init() throws Exception {
chunkSize = 1024 * 1024;
@@ -168,9 +165,6 @@ protected static void init() throws Exception {
initInputChunks();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(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 4607c813a66..c262b8267f1 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
@@ -26,7 +26,6 @@
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
@@ -95,13 +94,6 @@ public class TestFailureHandlingByClient {
private String keyString;
private final List<DatanodeDetails> restartDataNodes = new ArrayList<>();
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -169,9 +161,6 @@ public void restartDownDataNodes() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public void shutdown() {
IOUtils.closeQuietly(client);
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 2f83af53c89..a4d79e99f06 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
@@ -25,7 +25,6 @@
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import java.io.IOException;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
@@ -81,13 +80,6 @@ public class TestFailureHandlingByClientFlushDelay {
private String bucketName;
private String keyString;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
private void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, 100, TimeUnit.SECONDS);
@@ -149,9 +141,6 @@ private void startCluster() throws Exception {
init();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
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 7628819e7e0..55ec9cec76d 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,13 +59,6 @@ public class TestHybridPipelineOnDatanode {
private static OzoneClient client;
private static ObjectStore objectStore;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -78,9 +71,6 @@ public static void init() throws Exception {
objectStore = client.getObjectStore();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
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 fba29d210fe..eb9958be414 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
@@ -23,7 +23,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import java.io.IOException;
import java.time.Duration;
import java.util.List;
import java.util.UUID;
@@ -70,13 +69,6 @@ public class TestMultiBlockWritesWithDnFailures {
private String bucketName;
private String keyString;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
private void startCluster(int datanodes) throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
chunkSize = (int) OzoneConsts.MB;
@@ -121,9 +113,6 @@ private void startCluster(int datanodes) throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
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 6628673bb4c..943d85cb68d 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
@@ -22,7 +22,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.UUID;
import org.apache.hadoop.hdds.client.ReplicationFactor;
@@ -74,13 +73,6 @@ public class TestOzoneClientRetriesOnExceptionFlushDelay {
private String keyString;
private XceiverClientManager xceiverClientManager;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
OzoneClientConfig config = conf.getObject(OzoneClientConfig.class);
@@ -120,9 +112,6 @@ private String getKeyName() {
return UUID.randomUUID().toString();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
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 217b9159687..beedc54d553 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
@@ -83,13 +83,6 @@ public class TestOzoneClientRetriesOnExceptions {
private String keyString;
private XceiverClientManager xceiverClientManager;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class);
@@ -131,9 +124,6 @@ private String getKeyName() {
return UUID.randomUUID().toString();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
index c98278116ef..2fe0dfa6672 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
@@ -92,13 +92,6 @@ public class TestOzoneRpcClientForAclAuditLog {
private static StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
- /**
- * Create a MiniOzoneCluster for testing.
- *
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
System.setProperty("log4j.configurationFile", "auditlog.properties");
@@ -114,11 +107,6 @@ public static void init() throws Exception {
emptyAuditLog();
}
- /**
- * Create a MiniOzoneCluster for testing.
- * @param conf Configurations to start the cluster.
- * @throws Exception
- */
private static void startCluster(OzoneConfiguration conf) throws Exception {
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java
index 9cf9d252c48..24ffbfc3136 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java
@@ -30,7 +30,6 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import java.io.File;
-import java.io.IOException;
import java.nio.file.Path;
import java.time.Duration;
import java.util.HashMap;
@@ -81,11 +80,6 @@ public class TestValidateBCSIDOnRestart {
private static String volumeName;
private static String bucketName;
- /**
- * Create a MiniDFSCluster for testing.
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
@@ -137,9 +131,6 @@ public static void init() throws Exception {
objectStore.getVolume(volumeName).createBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java
index 066de7608d5..195b69d8014 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java
@@ -90,9 +90,6 @@ public class TestECContainerRecovery {
private static int dataBlocks = 3;
private static byte[][] inputChunks = new byte[dataBlocks][CHUNK_SIZE];
- /**
- * Create a MiniDFSCluster for testing.
- */
@BeforeAll
public static void init() throws Exception {
OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class);
@@ -153,9 +150,6 @@ public static void init() throws Exception {
initInputChunks();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
index 4aad7ca794e..12bd4b0da3b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
@@ -72,13 +72,6 @@ public class TestCloseContainerByPipeline {
private static OzoneClient client;
private static ObjectStore objectStore;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
@@ -97,9 +90,6 @@ public static void init() throws Exception {
objectStore.getVolume("test").createBucket("test");
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
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 7902e5374a5..86d0bbe84b6 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
@@ -28,12 +28,6 @@
public class TestDataValidateWithSafeByteOperations extends TestDataValidate {
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -42,9 +36,6 @@ public static void init() throws Exception {
startCluster(conf);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
shutdownCluster();
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 022878a8dc5..e68a0a7838b 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
@@ -27,12 +27,6 @@
*/
public class TestDataValidateWithUnsafeByteOperations extends TestDataValidate
{
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -41,9 +35,6 @@ public static void init() throws Exception {
startCluster(conf);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
shutdownCluster();
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 ad67a40cbe1..54e8cabc11f 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
@@ -41,12 +41,6 @@
public class TestFreonWithDatanodeFastRestart {
private static MiniOzoneCluster cluster;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -57,9 +51,6 @@ public static void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java
index c996e06170b..a55657b7222 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java
@@ -46,12 +46,6 @@ public class TestFreonWithPipelineDestroy {
private static MiniOzoneCluster cluster;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -79,9 +73,6 @@ public static void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOMSnapshotDAG.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOMSnapshotDAG.java
index 9f69ed51b7c..3f10edae586 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOMSnapshotDAG.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOMSnapshotDAG.java
@@ -82,11 +82,6 @@ public class TestOMSnapshotDAG {
private static ObjectStore store;
private static OzoneClient client;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- */
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
@@ -118,9 +113,6 @@ public static void init() throws Exception {
GenericTestUtils.setLogLevel(RaftServer.LOG, Level.INFO);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
index 3609703c7ef..051addfd8ff 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
@@ -126,13 +126,6 @@ public class TestOMRatisSnapshots {
private OzoneClient client;
private GenericTestUtils.PrintStreamCapturer output;
- /**
- * Create a MiniOzoneCluster for testing. The cluster initially has one
- * inactive OM. So at the start of the cluster, there will be 2 active and 1
- * inactive OM.
- *
- * @throws IOException
- */
@BeforeEach
public void init(TestInfo testInfo) throws Exception {
conf = new OzoneConfiguration();
@@ -184,9 +177,6 @@ public void init(TestInfo testInfo) throws Exception {
ozoneBucket = retVolumeinfo.getBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
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 01e8463f6a9..350cc09c7ba 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
@@ -70,11 +70,6 @@ public class TestOmAcls {
AuditLogTestUtils.enableAuditLog();
}
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
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 e461fc44c2a..b4c0790e5c5 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
@@ -35,13 +35,6 @@ public class TestOmInit {
private static MiniOzoneCluster cluster = null;
private static OzoneConfiguration conf;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
@@ -50,9 +43,6 @@ public static void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
if (cluster != null) {
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 8edece39908..495ff705607 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
@@ -106,9 +106,6 @@ public class TestOmMetrics {
private final OMException exception =
new OMException("dummyException", OMException.ResultCodes.TIMEOUT);
private OzoneClient client;
- /**
- * Create a MiniDFSCluster for testing.
- */
@BeforeAll
public void setup() throws Exception {
@@ -132,9 +129,6 @@ private void startCluster() throws Exception {
.getClientProxy().getOzoneManagerClient();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public void shutdown() {
IOUtils.closeQuietly(client);
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 dd75a087065..07904fda6f5 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
@@ -127,13 +127,6 @@ public static Duration getRetryCacheDuration() {
return RETRY_CACHE_DURATION;
}
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
@@ -180,9 +173,6 @@ public static void init() throws Exception {
objectStore = client.getObjectStore();
}
- /**
- * Shutdown MiniDFSCluster after all tests of a class have run.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
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 f63ecff0f80..86d96cc1d1c 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
@@ -29,7 +29,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.RandomStringUtils;
@@ -58,13 +57,6 @@ public class TestOzoneManagerRestart {
private static MiniOzoneCluster cluster = null;
private static OzoneClient client;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true
- *
- * @throws IOException
- */
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -80,9 +72,6 @@ public static void init() throws Exception {
client = cluster.newClient();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
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 8c0b3ff4e4b..9a9c70acb1e 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
@@ -51,9 +51,6 @@ public void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
if (cluster != null) {
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 90c67133ac5..c5f30fdb895 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
@@ -92,14 +92,6 @@ public class TestScmSafeMode {
private StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
- /**
- * Create a MiniDFSCluster for testing.
- * <p>
- * Ozone is made active by setting OZONE_ENABLED = true and
- * OZONE_HANDLER_TYPE_KEY = "distributed"
- *
- * @throws IOException
- */
@BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -118,9 +110,6 @@ public void init() throws Exception {
.getStorageContainerLocationClient();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
index 19b237fe260..585d8a94395 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
@@ -219,9 +219,6 @@ public TestOmSnapshot(BucketLayout newBucketLayout,
}
}
- /**
- * Create a MiniDFSCluster for testing.
- */
private void init() throws Exception {
conf = new OzoneConfiguration();
conf.setBoolean(OZONE_OM_ENABLE_FILESYSTEM_PATHS, enabledFileSystemPaths);
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 4d5f1dda1c7..211d6e61db8 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
@@ -53,9 +53,6 @@ public class TestOzoneManagerSnapshotProvider {
private OzoneClient client;
- /**
- * Create a MiniDFSCluster for testing.
- */
@BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
@@ -69,9 +66,6 @@ public void init() throws Exception {
objectStore = client.getObjectStore();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java
index 80b2ca9dfe3..eabafc45176 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java
@@ -104,11 +104,6 @@ public class TestSnapshotBackgroundServices {
private OzoneClient client;
private final AtomicInteger counter = new AtomicInteger();
- /**
- * Create a MiniOzoneCluster for testing. The cluster initially has one
- * inactive OM. So at the start of the cluster, there will be 2 active and 1
- * inactive OM.
- */
@BeforeEach
public void init(TestInfo testInfo) throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -187,9 +182,6 @@ public void init(TestInfo testInfo) throws Exception {
ozoneBucket = retVolumeinfo.getBucket(bucketName);
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
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 b0385095aa7..a193bc817e8 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
@@ -156,12 +156,6 @@ public class TestOzoneShellHA {
private static OzoneConfiguration ozoneConfiguration;
- /**
- * Create a MiniOzoneCluster for testing with using distributed Ozone
- * handler type.
- *
- * @throws Exception
- */
@BeforeAll
public void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
index a5e9ebd0420..027d2851de8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHAWithFSO.java
@@ -28,10 +28,6 @@
*/
public class TestOzoneShellHAWithFSO extends TestOzoneShellHA {
- /**
- * Create a MiniOzoneCluster for testing with using distributed Ozone
- * handler type.
- */
@BeforeAll
@Override
public void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
index 0ad9f62f1cc..5d06b3ad90c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
@@ -100,12 +100,6 @@ public class TestOzoneTenantShell {
private static final boolean USE_ACTUAL_RANGER = false;
- /**
- * Create a MiniOzoneCluster for testing with using distributed Ozone
- * handler type.
- *
- * @throws Exception
- */
@BeforeAll
public static void init() throws Exception {
// Remove audit log output if it exists
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
index f0c27e6e259..b187e3179fc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
@@ -22,7 +22,6 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -55,11 +54,6 @@ public class TestTransferLeadershipShell {
private static final long SNAPSHOT_THRESHOLD = 5;
- /**
- * Create a MiniOzoneCluster for testing.
- *
- * @throws IOException Exception
- */
@BeforeAll
public void init() throws Exception {
ozoneAdmin = new OzoneAdmin();
@@ -77,9 +71,6 @@ public void init() throws Exception {
cluster.waitForClusterToBeReady();
}
- /**
- * Shutdown MiniDFSCluster.
- */
@AfterAll
public void shutdown() {
if (cluster != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]