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 de1392809a6 HDDS-15814. Rename TestHelper to OzoneTestHelper (#10920)
de1392809a6 is described below
commit de1392809a6a7e265e9aa38def3e1fc26b519334
Author: Prathmesh Sapate <[email protected]>
AuthorDate: Sat Aug 1 15:39:05 2026 +0530
HDDS-15814. Rename TestHelper to OzoneTestHelper (#10920)
---
.../ozone/recon/TestReconAndAdminContainerCLI.java | 8 +++----
.../java/org/apache/hadoop/fs/ozone/TestHSync.java | 4 ++--
.../apache/hadoop/hdds/scm/TestWatchForCommit.java | 12 +++++-----
.../client/rpc/TestBlockDataStreamOutput.java | 8 +++----
.../ozone/client/rpc/TestBlockOutputStream.java | 6 ++---
.../rpc/TestBlockOutputStreamWithFailures.java | 12 +++++-----
.../ozone/client/rpc/TestClientRetryTimeout.java | 4 ++--
.../rpc/TestCloseContainerHandlingByClient.java | 8 +++----
.../rpc/TestContainerReplicationEndToEnd.java | 4 ++--
.../client/rpc/TestContainerStateMachine.java | 4 ++--
.../rpc/TestContainerStateMachineFailures.java | 28 +++++++++++-----------
.../rpc/TestContainerStateMachineStream.java | 4 ++--
.../client/rpc/TestDiscardPreallocatedBlocks.java | 4 ++--
.../ozone/client/rpc/TestECKeyOutputStream.java | 8 +++----
.../client/rpc/TestFailureHandlingByClient.java | 12 +++++-----
.../rpc/TestFailureHandlingByClientFlushDelay.java | 6 ++---
.../rpc/TestMultiBlockWritesWithDnFailures.java | 6 ++---
...estOzoneClientRetriesOnExceptionFlushDelay.java | 8 +++----
.../rpc/TestOzoneClientRetriesOnExceptions.java | 10 ++++----
.../client/rpc/TestValidateBCSIDOnRestart.java | 10 ++++----
.../ozone/client/rpc/read/InputStreamTests.java | 4 ++--
.../ozone/client/rpc/read/TestKeyInputStream.java | 6 ++---
.../{TestHelper.java => OzoneTestHelper.java} | 6 ++---
.../ozone/container/TestContainerReplication.java | 6 ++---
.../container/TestContainerReportHandling.java | 8 +++----
.../commandhandler/TestBlockDeletion.java | 6 ++---
.../TestContainerCommandReconciliation.java | 15 ++++++------
...estDuplicateContainerDirScannerIntegration.java | 6 ++---
.../scanner/ContainerScannerIntegrationTests.java | 6 ++---
.../freon/TestFreonWithDatanodeFastRestart.java | 4 ++--
.../shell/TestReplicationConfigPreference.java | 8 +++----
31 files changed, 121 insertions(+), 120 deletions(-)
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java
index 3d3bd862bc1..add48e2e28f 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java
@@ -72,7 +72,7 @@
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -208,7 +208,7 @@ void testMissingContainer() throws Exception {
for (DatanodeDetails details : pipeline.getNodes()) {
cluster.shutdownHddsDatanode(details);
}
- TestHelper.waitForReplicaCount(containerID, 0, cluster);
+ OzoneTestHelper.waitForReplicaCount(containerID, 0, cluster);
GenericTestUtils.waitFor(() -> {
try {
@@ -272,7 +272,7 @@ void testNodesInDecommissionOrMaintenance(
// a new replica-copy is made to another node.
// For maintenance, there is no replica-copy in this case.
if (!isMaintenance) {
- TestHelper.waitForReplicaCount(containerIdR3, 4, cluster);
+ OzoneTestHelper.waitForReplicaCount(containerIdR3, 4, cluster);
}
compareRMReportToReconResponse(underReplicatedState);
@@ -299,7 +299,7 @@ void testNodesInDecommissionOrMaintenance(
// There will be a replica copy for both maintenance and decommission.
// maintenance 3 -> 4, decommission 4 -> 5.
int expectedReplicaNum = isMaintenance ? 4 : 5;
- TestHelper.waitForReplicaCount(containerIdR3, expectedReplicaNum, cluster);
+ OzoneTestHelper.waitForReplicaCount(containerIdR3, expectedReplicaNum,
cluster);
compareRMReportToReconResponse(underReplicatedState);
compareRMReportToReconResponse(overReplicatedState);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
index bb240bbc597..b3314579c13 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
@@ -107,7 +107,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import
org.apache.hadoop.ozone.container.keyvalue.impl.AbstractTestChunkManager;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
@@ -390,7 +390,7 @@ private static String
getChunkPathOnDataNode(FSDataOutputStream outputStream)
List<OmKeyLocationInfo> locationInfoList =
groupOutputStream.getLocationInfoList();
OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
- HddsDatanodeService dn = TestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
+ HddsDatanodeService dn =
OzoneTestHelper.getDatanodeService(omKeyLocationInfo, cluster);
chunkPath = dn.getDatanodeStateMachine()
.getContainer().getContainerSet()
.getContainer(omKeyLocationInfo.getContainerID()).
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 6125178ade0..35ca57d3147 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
@@ -60,7 +60,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.GenericTestUtils.LogCapturer;
import org.apache.ozone.test.tag.Flaky;
import org.apache.ratis.proto.RaftProtos;
@@ -248,7 +248,7 @@ public void
testWatchForCommitForRetryfailure(RaftProtos.ReplicationLevel watchT
assertEquals(1, xceiverClient.getRefcount());
assertEquals(container1.getPipeline(), xceiverClient.getPipeline());
Pipeline pipeline = xceiverClient.getPipeline();
- TestHelper.createPipelineOnDatanode(pipeline, cluster);
+ OzoneTestHelper.createPipelineOnDatanode(pipeline, cluster);
XceiverClientReply reply = xceiverClient.sendCommandAsync(
ContainerTestHelper.getCreateContainerRequest(
container1.getContainerInfo().getContainerID(),
@@ -301,7 +301,7 @@ public void
test2WayCommitForTimeoutException(RaftProtos.ReplicationLevel watchT
assertEquals(1, xceiverClient.getRefcount());
assertEquals(container1.getPipeline(), xceiverClient.getPipeline());
Pipeline pipeline = xceiverClient.getPipeline();
- TestHelper.createPipelineOnDatanode(pipeline, cluster);
+ OzoneTestHelper.createPipelineOnDatanode(pipeline, cluster);
XceiverClientRatis ratisClient = (XceiverClientRatis) xceiverClient;
XceiverClientReply reply = xceiverClient.sendCommandAsync(
ContainerTestHelper.getCreateContainerRequest(
@@ -361,7 +361,7 @@ public void testWatchForCommitForGroupMismatchException()
throws Exception {
assertEquals(3, ratisClient.getCommitInfoMap().size());
List<Pipeline> pipelineList = new ArrayList<>();
pipelineList.add(pipeline);
- TestHelper.waitForPipelineClose(pipelineList, cluster);
+ OzoneTestHelper.waitForPipelineClose(pipelineList, cluster);
// just watch for a log index which in not updated in the commitInfo
Map
// as well as there is no logIndex generate in Ratis.
// The basic idea here is just to test if its throws an exception.
@@ -377,12 +377,12 @@ public void testWatchForCommitForGroupMismatchException()
throws Exception {
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
index b4337a494e1..c011c774c77 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
@@ -61,7 +61,7 @@
import org.apache.hadoop.ozone.client.io.KeyDataStreamOutput;
import org.apache.hadoop.ozone.client.io.OzoneDataStreamOutput;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -247,7 +247,7 @@ private void testWriteWithFailure(OzoneClient client, int
dataLength) throws Exc
ByteBufferStreamOutput stream =
keyDataStreamOutput.getStreamEntries().get(0).getByteBufStreamOutput();
assertInstanceOf(BlockDataStreamOutput.class, stream);
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
key.write(b);
key.close();
String dataString = new String(data, UTF_8);
@@ -256,12 +256,12 @@ private void testWriteWithFailure(OzoneClient client, int
dataLength) throws Exc
static OzoneDataStreamOutput createKey(OzoneClient client, String keyName,
long size) throws Exception {
- return TestHelper.createStreamKey(keyName, ReplicationType.RATIS, size,
+ return OzoneTestHelper.createStreamKey(keyName, ReplicationType.RATIS,
size,
client.getObjectStore(), VOLUME_NAME, BUCKET_NAME);
}
static void validateData(OzoneClient client, String keyName, byte[] data)
throws Exception {
- TestHelper.validateData(
+ OzoneTestHelper.validateData(
keyName, data, client.getObjectStore(), VOLUME_NAME, BUCKET_NAME);
}
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 65c91bb8a5d..a525573a5cb 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
@@ -23,7 +23,7 @@
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE;
-import static org.apache.hadoop.ozone.container.TestHelper.validateData;
+import static org.apache.hadoop.ozone.container.OzoneTestHelper.validateData;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -57,7 +57,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -789,7 +789,7 @@ static OzoneOutputStream createKey(OzoneClient client,
String keyName)
static OzoneOutputStream createKey(OzoneClient client, String keyName,
long size, ReplicationFactor factor) throws Exception {
- return TestHelper.createKey(keyName, ReplicationType.RATIS, factor, size,
+ return OzoneTestHelper.createKey(keyName, ReplicationType.RATIS, factor,
size,
client.getObjectStore(), VOLUME, BUCKET);
}
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 70e15f9b677..920aae8d247 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
@@ -29,7 +29,7 @@
import static
org.apache.hadoop.ozone.client.rpc.TestBlockOutputStream.getKeyName;
import static
org.apache.hadoop.ozone.client.rpc.TestBlockOutputStream.newClient;
import static
org.apache.hadoop.ozone.client.rpc.TestBlockOutputStream.newClientConfig;
-import static org.apache.hadoop.ozone.container.TestHelper.validateData;
+import static org.apache.hadoop.ozone.container.OzoneTestHelper.validateData;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -51,7 +51,7 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.tag.Flaky;
import org.apache.ratis.protocol.exceptions.GroupMismatchException;
import org.apache.ratis.protocol.exceptions.RaftRetryFailureException;
@@ -159,7 +159,7 @@ private void
testWatchForCommitWithCloseContainerException(OzoneClient client)
(XceiverClientRatis) blockOutputStream.getXceiverClient();
assertEquals(3, raftClient.getCommitInfoMap().size());
// Close the containers on the Datanode and write more data
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
key.write(data1);
// As a part of handling the exception, 4 failed writeChunks will be
@@ -400,7 +400,7 @@ private void testWriteMoreThanMaxFlushSize(OzoneClient
client)
(XceiverClientRatis) blockOutputStream.getXceiverClient();
assertEquals(3, raftClient.getCommitInfoMap().size());
// Close the containers on the Datanode and write more data
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
key.write(data1);
// As a part of handling the exception, 2 failed writeChunks will be
@@ -468,7 +468,7 @@ private void testExceptionDuringClose(OzoneClient client)
throws Exception {
(XceiverClientRatis) blockOutputStream.getXceiverClient();
assertEquals(3, raftClient.getCommitInfoMap().size());
// Close the containers on the Datanode and write more data
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
key.write(data1);
// commitInfoMap will remain intact as there is no server failure
@@ -546,7 +546,7 @@ private void
testWatchForCommitWithSingleNodeRatis(OzoneClient client)
(XceiverClientRatis) blockOutputStream.getXceiverClient();
assertEquals(1, raftClient.getCommitInfoMap().size());
// Close the containers on the Datanode and write more data
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
// 4 writeChunks = maxFlushSize + 2 putBlocks will be discarded here
// once exception is hit
key.write(data1);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
index 4d925936839..82dee445c40 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestClientRetryTimeout.java
@@ -51,7 +51,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -473,7 +473,7 @@ private String getKeyName() {
}
private OzoneOutputStream createKey(String keyName) throws Exception {
- return TestHelper.createKey(keyName, ReplicationType.RATIS, 0,
+ return OzoneTestHelper.createKey(keyName, ReplicationType.RATIS, 0,
objectStore, volumeName, bucketName);
}
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 513c497477f..a65d37bf1ab 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
@@ -43,7 +43,7 @@
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@@ -313,18 +313,18 @@ public void testMultiBlockWrites3() throws Exception {
private void waitForContainerClose(OzoneOutputStream outputStream)
throws Exception {
- TestHelper
+ OzoneTestHelper
.waitForContainerClose(outputStream, cluster);
}
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
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 b81a7c19978..a1f7a02a1c0 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
@@ -56,7 +56,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
@@ -228,7 +228,7 @@ public void testContainerReplication() throws Exception {
}
// This will try to read the data from the dn to which the container got
// replicated after the container got closed.
- TestHelper
+ OzoneTestHelper
.validateData(keyName, testData, objectStore, volumeName, bucketName);
}
}
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 08feaa3b0dc..9a045178a8c 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
@@ -53,7 +53,7 @@
import org.apache.hadoop.ozone.client.SecretKeyTestClient;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import
org.apache.hadoop.ozone.container.common.transport.server.ratis.ContainerStateMachine;
import
org.apache.hadoop.ozone.container.common.transport.server.ratis.RatisServerConfiguration;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -169,7 +169,7 @@ public void testContainerStateMachineFailures() throws
Exception {
public void testRatisSnapshotRetention() throws Exception {
ContainerStateMachine stateMachine =
- (ContainerStateMachine) TestHelper.getStateMachine(cluster);
+ (ContainerStateMachine) OzoneTestHelper.getStateMachine(cluster);
SimpleStateMachineStorage storage =
(SimpleStateMachineStorage) stateMachine.getStateMachineStorage();
assertNull(StatemachineImplTestUtil.findLatestSnapshot(storage));
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 e9c41dc1c21..0ce38fedc11 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
@@ -86,7 +86,7 @@
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
@@ -223,7 +223,7 @@ public void
testContainerStateMachineCloseOnMissingPipeline()
OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
Set<HddsDatanodeService> datanodeSet =
- TestHelper.getDatanodeServices(cluster,
+ OzoneTestHelper.getDatanodeServices(cluster,
omKeyLocationInfo.getPipeline());
long containerID = omKeyLocationInfo.getContainerID();
@@ -277,7 +277,7 @@ public void
testContainerStateMachineRestartWithDNChangePipeline()
OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
Pipeline pipeline = omKeyLocationInfo.getPipeline();
List<HddsDatanodeService> datanodes =
- new ArrayList<>(TestHelper.getDatanodeServices(cluster,
+ new ArrayList<>(OzoneTestHelper.getDatanodeServices(cluster,
pipeline));
DatanodeDetails dn = datanodes.get(0).getDatanodeDetails();
@@ -336,7 +336,7 @@ public void testContainerStateMachineFailures() throws
Exception {
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
// Delete the container directory.
FileUtil.fullyDelete(new File(dn.getDatanodeStateMachine()
@@ -398,7 +398,7 @@ public void testUnhealthyContainer() throws Exception {
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
ContainerData containerData =
dn.getDatanodeStateMachine()
@@ -490,7 +490,7 @@ public void testApplyTransactionFailure() throws Exception {
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
index = cluster.getHddsDatanodeIndex(dn.getDatanodeDetails());
containerData = dn.getDatanodeStateMachine()
@@ -502,7 +502,7 @@ public void testApplyTransactionFailure() throws Exception {
containerID = omKeyLocationInfo.getContainerID();
}
ContainerStateMachine stateMachine =
- (ContainerStateMachine) TestHelper.getStateMachine(cluster.
+ (ContainerStateMachine) OzoneTestHelper.getStateMachine(cluster.
getHddsDatanodes().get(index), omKeyLocationInfo.getPipeline());
SimpleStateMachineStorage storage =
(SimpleStateMachineStorage) stateMachine.getStateMachineStorage();
@@ -581,7 +581,7 @@ void testApplyTransactionIdempotencyWithClosedContainer()
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
ContainerData containerData = dn.getDatanodeStateMachine()
.getContainer().getContainerSet()
@@ -591,7 +591,7 @@ void testApplyTransactionIdempotencyWithClosedContainer()
containerID = omKeyLocationInfo.getContainerID();
}
ContainerStateMachine stateMachine =
- (ContainerStateMachine) TestHelper.getStateMachine(dn,
+ (ContainerStateMachine) OzoneTestHelper.getStateMachine(dn,
omKeyLocationInfo.getPipeline());
SimpleStateMachineStorage storage =
(SimpleStateMachineStorage) stateMachine.getStateMachineStorage();
@@ -615,7 +615,7 @@ void testApplyTransactionIdempotencyWithClosedContainer()
ContainerProtos.CloseContainerRequestProto.getDefaultInstance());
xceiverClient.sendCommand(request.build());
assertSame(
- TestHelper.getDatanodeService(omKeyLocationInfo, cluster)
+ OzoneTestHelper.getDatanodeService(omKeyLocationInfo, cluster)
.getDatanodeStateMachine()
.getContainer().getContainerSet().getContainer(containerID)
.getContainerState(),
@@ -672,7 +672,7 @@ void
testWriteStateMachineDataIdempotencyWithClosedContainer()
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
ContainerData containerData =
dn.getDatanodeStateMachine()
@@ -683,7 +683,7 @@ void
testWriteStateMachineDataIdempotencyWithClosedContainer()
containerID = omKeyLocationInfo.getContainerID();
}
ContainerStateMachine stateMachine =
- (ContainerStateMachine) TestHelper.getStateMachine(dn,
+ (ContainerStateMachine) OzoneTestHelper.getStateMachine(dn,
omKeyLocationInfo.getPipeline());
SimpleStateMachineStorage storage =
(SimpleStateMachineStorage) stateMachine.getStateMachineStorage();
@@ -762,7 +762,7 @@ void
testWriteStateMachineDataIdempotencyWithClosedContainer()
"failed");
}
assertSame(
- TestHelper.getDatanodeService(omKeyLocationInfo, cluster)
+ OzoneTestHelper.getDatanodeService(omKeyLocationInfo, cluster)
.getDatanodeStateMachine()
.getContainer().getContainerSet().getContainer(containerID)
.getContainerState(),
@@ -844,7 +844,7 @@ private void induceFollowerFailure(OmKeyLocationInfo
omKeyLocationInfo,
int failureCount) {
DatanodeID leader = omKeyLocationInfo.getPipeline().getLeaderId();
Set<HddsDatanodeService> datanodeSet =
- TestHelper.getDatanodeServices(cluster,
+ OzoneTestHelper.getDatanodeServices(cluster,
omKeyLocationInfo.getPipeline());
int count = 0;
for (HddsDatanodeService dn : datanodeSet) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineStream.java
index 8f8bc5cf946..5e10814f508 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineStream.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.ozone.client.rpc;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_KEY;
-import static org.apache.hadoop.ozone.container.TestHelper.createStreamKey;
-import static org.apache.hadoop.ozone.container.TestHelper.getDatanodeService;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.createStreamKey;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.getDatanodeService;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
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 807963faf6b..4dcd5112db5 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
@@ -20,8 +20,8 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE_DEFAULT;
-import static org.apache.hadoop.ozone.container.TestHelper.createKey;
-import static
org.apache.hadoop.ozone.container.TestHelper.waitForContainerClose;
+import static org.apache.hadoop.ozone.container.OzoneTestHelper.createKey;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.waitForContainerClose;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
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 7de941db569..5a7f2ad68f2 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
@@ -73,7 +73,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.interfaces.Handler;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.ozone.test.GenericTestUtils;
@@ -175,7 +175,7 @@ public static void shutdown() {
@Test
public void testCreateKeyWithECReplicationConfig() throws Exception {
- try (OzoneOutputStream key = TestHelper
+ try (OzoneOutputStream key = OzoneTestHelper
.createKey(keyString, new ECReplicationConfig(3, 2,
ECReplicationConfig.EcCodec.RS, chunkSize), inputSize,
objectStore, volumeName, bucketName)) {
@@ -207,7 +207,7 @@ public void testECKeyCreatetWithDatanodeIdChange()
ObjectStore store = client1.getObjectStore();
store.createVolume(volumeName);
store.getVolume(volumeName).createBucket(bucketName);
- OzoneOutputStream key = TestHelper.createKey(keyString, new
ECReplicationConfig(3, 2,
+ OzoneOutputStream key = OzoneTestHelper.createKey(keyString, new
ECReplicationConfig(3, 2,
ECReplicationConfig.EcCodec.RS, 1024), inputSize, store, volumeName,
bucketName);
byte[] b = new byte[6 * 1024];
ECKeyOutputStream groupOutputStream = (ECKeyOutputStream)
key.getOutputStream();
@@ -568,7 +568,7 @@ private byte[] getInputBytes(int offset, int bufferChunks,
int numChunks) {
@Test
public void testBlockedHflushAndHsync() throws Exception {
// Expect ECKeyOutputStream hflush and hsync calls to throw exception
- try (OzoneOutputStream oOut = TestHelper.createKey(
+ try (OzoneOutputStream oOut = OzoneTestHelper.createKey(
keyString, new ECReplicationConfig(3, 2,
ECReplicationConfig.EcCodec.RS, chunkSize),
inputSize, objectStore, volumeName, bucketName)) {
assertInstanceOf(ECKeyOutputStream.class, oOut.getOutputStream());
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 5ccf9b98b18..4f7f23d3b1f 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
@@ -61,7 +61,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
import org.apache.hadoop.ozone.container.common.interfaces.DBHandle;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer;
@@ -384,7 +384,7 @@ public void
testContainerExclusionWithClosedContainerException()
containerIdList.add(containerId);
// below check will assert if the container does not get closed
- TestHelper
+ OzoneTestHelper
.waitForContainerClose(cluster, containerIdList.toArray(new
Long[0]));
// This write will hit ClosedContainerException and this container should
@@ -437,7 +437,7 @@ public void
testDatanodeExclusionWithMajorityCommit(RaftProtos.ReplicationLevel
.getFixedLengthString(keyString, chunkSize);
BlockID blockId;
- try (OzoneOutputStream key = TestHelper.createKey(keyName, RATIS,
blockSize, localObjectStore, volumeName,
+ try (OzoneOutputStream key = OzoneTestHelper.createKey(keyName, RATIS,
blockSize, localObjectStore, volumeName,
bucketName)) {
// get the name of a valid container
KeyOutputStream keyOutputStream =
@@ -492,7 +492,7 @@ public void
testDatanodeExclusionWithMajorityCommit(RaftProtos.ReplicationLevel
keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().get(0)
.getBlockID(), blockId);
assertEquals(3L * data.getBytes(UTF_8).length, keyInfo.getDataSize());
- TestHelper.validateData(keyName,
data.concat(data).concat(data).getBytes(UTF_8),
+ OzoneTestHelper.validateData(keyName,
data.concat(data).concat(data).getBytes(UTF_8),
localObjectStore, volumeName, bucketName);
IOUtils.closeQuietly(localClient);
}
@@ -558,12 +558,12 @@ public void testPipelineExclusionWithPipelineFailure()
throws Exception {
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
}
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 f94c1171111..8544313b1e2 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
@@ -58,7 +58,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.junit.jupiter.api.AfterEach;
@@ -210,12 +210,12 @@ public void testPipelineExclusionWithPipelineFailure()
throws Exception {
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
}
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 4d88ce7544d..188b84c9289 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
@@ -48,7 +48,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@@ -218,12 +218,12 @@ public void
testMultiBlockWritesWithIntermittentDnFailures()
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
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 fb6cbb4acbf..2049bd20484 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
@@ -48,7 +48,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ratis.protocol.exceptions.GroupMismatchException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -151,7 +151,7 @@ public void testGroupMismatchExceptionHandling() throws
Exception {
OutputStream stream = keyOutputStream.getStreamEntries().get(0)
.getOutputStream();
BlockOutputStream blockOutputStream =
assertInstanceOf(BlockOutputStream.class, stream);
- TestHelper.waitForPipelineClose(key, cluster, false);
+ OzoneTestHelper.waitForPipelineClose(key, cluster, false);
key.flush();
assertInstanceOf(GroupMismatchException.class,
HddsClientUtils.checkForException(blockOutputStream.getIoException()));
@@ -165,13 +165,13 @@ public void testGroupMismatchExceptionHandling() throws
Exception {
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, ReplicationFactor.ONE,
size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
}
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 fe02f248655..88e090c91a1 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
@@ -55,7 +55,7 @@
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ratis.protocol.exceptions.GroupMismatchException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
@@ -162,7 +162,7 @@ public void testGroupMismatchExceptionHandling() throws
Exception {
OutputStream stream = keyOutputStream.getStreamEntries().get(0)
.getOutputStream();
BlockOutputStream blockOutputStream =
assertInstanceOf(BlockOutputStream.class, stream);
- TestHelper.waitForPipelineClose(key, cluster, false);
+ OzoneTestHelper.waitForPipelineClose(key, cluster, false);
key.flush();
assertInstanceOf(GroupMismatchException.class,
HddsClientUtils.checkForException(blockOutputStream.getIoException()));
@@ -210,7 +210,7 @@ void testMaxRetriesByOzoneClient() throws Exception {
key.write(data1);
OutputStream stream = entries.get(0).getOutputStream();
BlockOutputStream blockOutputStream =
assertInstanceOf(BlockOutputStream.class, stream);
- TestHelper.waitForContainerClose(key, cluster);
+ OzoneTestHelper.waitForContainerClose(key, cluster);
// Ensure that blocks for the key have been allocated to at least N+1
// containers so that write request will be tried on N+1 different blocks
// of N+1 different containers and it will finally fail as it will hit
@@ -236,13 +236,13 @@ void testMaxRetriesByOzoneClient() throws Exception {
private OzoneOutputStream createKey(String keyName, ReplicationType type,
long size) throws Exception {
- return TestHelper
+ return OzoneTestHelper
.createKey(keyName, type, ReplicationFactor.ONE,
size, objectStore, volumeName, bucketName);
}
private void validateData(String keyName, byte[] data) throws Exception {
- TestHelper
+ OzoneTestHelper
.validateData(keyName, data, objectStore, volumeName, bucketName);
}
}
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 fcf2d6339ee..0feaa33d908 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
@@ -53,7 +53,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
import org.apache.hadoop.ozone.container.common.interfaces.DBHandle;
@@ -159,10 +159,10 @@ public void testValidateBCSIDOnDnRestart() throws
Exception {
groupOutputStream.getLocationInfoList();
assertEquals(1, locationInfoList.size());
omKeyLocationInfo = locationInfoList.get(0);
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
ContainerData containerData =
- TestHelper.getDatanodeService(omKeyLocationInfo, cluster)
+ OzoneTestHelper.getDatanodeService(omKeyLocationInfo, cluster)
.getDatanodeStateMachine()
.getContainer().getContainerSet()
.getContainer(omKeyLocationInfo.getContainerID())
@@ -182,7 +182,7 @@ public void testValidateBCSIDOnDnRestart() throws Exception
{
.getContainer();
ozoneContainer.getContainerSet().removeContainer(containerID);
ContainerStateMachine stateMachine =
- (ContainerStateMachine) TestHelper.getStateMachine(cluster.
+ (ContainerStateMachine) OzoneTestHelper.getStateMachine(cluster.
getHddsDatanodes().get(index),
omKeyLocationInfo.getPipeline());
SimpleStateMachineStorage storage =
@@ -212,7 +212,7 @@ public void testValidateBCSIDOnDnRestart() throws Exception
{
assertEquals(1, locationInfoList.size());
omKeyLocationInfo = locationInfoList.get(0);
containerID = omKeyLocationInfo.getContainerID();
- dn = TestHelper.getDatanodeService(omKeyLocationInfo,
+ dn = OzoneTestHelper.getDatanodeService(omKeyLocationInfo,
cluster);
ContainerData containerData = dn.getDatanodeStateMachine()
.getContainer().getContainerSet()
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
index ad5fdd2b1de..9ef3153b5f3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
@@ -37,7 +37,7 @@
import org.apache.hadoop.ozone.ClientConfigForTesting;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -128,7 +128,7 @@ private void closeContainers() {
scm.getContainerManager().getContainers().forEach(container -> {
if (container.isOpen()) {
try {
- TestHelper.waitForContainerClose(getCluster(),
container.getContainerID());
+ OzoneTestHelper.waitForContainerClose(getCluster(),
container.getContainerID());
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
index aec35fa2f75..625fef6090d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
@@ -19,7 +19,7 @@
import static org.apache.hadoop.hdds.client.ECReplicationConfig.EcCodec.RS;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
-import static org.apache.hadoop.ozone.container.TestHelper.countReplicas;
+import static org.apache.hadoop.ozone.container.OzoneTestHelper.countReplicas;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -44,7 +44,7 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.io.KeyInputStream;
import org.apache.hadoop.ozone.common.utils.BufferUtils;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.keyvalue.ContainerLayoutTestInfo;
import org.apache.hadoop.ozone.om.BucketForTesting;
@@ -411,7 +411,7 @@ private void testReadAfterReplication(BucketForTesting
bucket, boolean doUnbuffe
long containerID = loc.getContainerID();
assertEquals(3, countReplicas(containerID, getCluster()));
- TestHelper.waitForContainerClose(getCluster(), containerID);
+ OzoneTestHelper.waitForContainerClose(getCluster(), containerID);
List<DatanodeDetails> pipelineNodes = loc.getPipeline().getNodes();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/OzoneTestHelper.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/OzoneTestHelper.java
index bf6dd3306d3..9558be28256 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/OzoneTestHelper.java
@@ -81,15 +81,15 @@
/**
* Helpers for container tests.
*/
-public final class TestHelper {
+public final class OzoneTestHelper {
private static final Logger LOG =
- LoggerFactory.getLogger(TestHelper.class);
+ LoggerFactory.getLogger(OzoneTestHelper.class);
/**
* Never constructed.
*/
- private TestHelper() {
+ private OzoneTestHelper() {
}
public static boolean isContainerClosed(MiniOzoneCluster cluster,
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 5db27818949..3a929c62d5a 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
@@ -25,9 +25,9 @@
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import static org.apache.hadoop.ozone.container.TestHelper.isContainerClosed;
-import static
org.apache.hadoop.ozone.container.TestHelper.waitForContainerClose;
-import static org.apache.hadoop.ozone.container.TestHelper.waitForReplicaCount;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.isContainerClosed;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.waitForContainerClose;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.waitForReplicaCount;
import static org.apache.ozone.test.GenericTestUtils.setLogLevel;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java
index 287ed05604a..dbc74d23bd8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java
@@ -21,7 +21,7 @@
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import static
org.apache.hadoop.ozone.container.TestHelper.waitForContainerClose;
+import static
org.apache.hadoop.ozone.container.OzoneTestHelper.waitForContainerClose;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -53,7 +53,7 @@
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
-import org.apache.hadoop.ozone.container.TestHelper.ReplicationInput;
+import org.apache.hadoop.ozone.container.OzoneTestHelper.ReplicationInput;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@@ -164,7 +164,7 @@ void
testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReported() throws Except
// flips to CLOSED as soon as the first replica is reported CLOSED, so
a lagging replica may still be CLOSING in
// SCM. Deleting then races with that lagging CLOSING report, which
would resurrect the container out of
// DELETING/DELETED and the replicas would never be deleted.
- TestHelper.waitForReplicaState(containerManager, containerID,
replicationInput.getNumDatanodes(),
+ OzoneTestHelper.waitForReplicaState(containerManager, containerID,
replicationInput.getNumDatanodes(),
ContainerReplicaProto.State.CLOSED);
// move the container to DELETING
@@ -190,7 +190,7 @@ void
testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReported() throws Except
private void waitForContainerClosedInSCM(ContainerID containerID)
throws TimeoutException, InterruptedException {
for (StorageContainerManager scm : cluster.getStorageContainerManagers()) {
- TestHelper.waitForContainerStateInSCM(scm, containerID,
LifeCycleState.CLOSED);
+ OzoneTestHelper.waitForContainerStateInSCM(scm, containerID,
LifeCycleState.CLOSED);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
index 3c561c93f9e..d24a055540d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
@@ -79,7 +79,7 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
@@ -492,7 +492,7 @@ public void testContainerStateAfterDNRestart() throws
Exception {
OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm);
// Wait for container to close
- TestHelper.waitForContainerClose(cluster,
+ OzoneTestHelper.waitForContainerClose(cluster,
containerIdList.toArray(new Long[0]));
// Make sure the containers are closed on the DN.
omKeyLocationInfoGroupList.forEach((group) -> {
@@ -622,7 +622,7 @@ public void testContainerDeleteWithInvalidKeyCount()
OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm);
// Wait for container to close
- TestHelper.waitForContainerClose(cluster,
+ OzoneTestHelper.waitForContainerClose(cluster,
containerIdList.toArray(new Long[0]));
// Make sure the containers are closed on the DN.
omKeyLocationInfoGroupList.forEach((group) -> {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
index 51c27940ec9..fcbc8a12ab7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
@@ -101,7 +101,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.checksum.ContainerChecksumTreeManager;
import org.apache.hadoop.ozone.container.checksum.ContainerMerkleTreeWriter;
import org.apache.hadoop.ozone.container.checksum.DNContainerOperationClient;
@@ -430,7 +430,7 @@ public void testContainerChecksumWithBlockMissing() throws
Exception {
ContainerProtos.ContainerChecksumInfo newContainerChecksumInfo =
readChecksumFile(container.getContainerData());
assertTreesSortedAndMatch(oldContainerChecksumInfo.getContainerMerkleTree(),
newContainerChecksumInfo.getContainerMerkleTree());
- TestHelper.validateData(KEY_NAME, data, store, volume, bucket);
+ OzoneTestHelper.validateData(KEY_NAME, data, store, volume, bucket);
}
@Test
@@ -481,7 +481,7 @@ public void testContainerChecksumChunkCorruption() throws
Exception {
assertTreesSortedAndMatch(oldContainerChecksumInfo.getContainerMerkleTree(),
newContainerChecksumInfo.getContainerMerkleTree());
assertEquals(oldDataChecksum,
newContainerChecksumInfo.getContainerMerkleTree().getDataChecksum());
- TestHelper.validateData(KEY_NAME, data, store, volume, bucket);
+ OzoneTestHelper.validateData(KEY_NAME, data, store, volume, bucket);
}
@Test
@@ -564,7 +564,7 @@ public void testDataChecksumReportedAtSCM() throws
Exception {
for (HddsProtos.SCMContainerReplicaProto containerReplica:
containerReplicas) {
assertNotEquals(0, containerReplica.getDataChecksum());
}
- TestHelper.validateData(KEY_NAME, data, store, volume, bucket);
+ OzoneTestHelper.validateData(KEY_NAME, data, store, volume, bucket);
}
private void waitForDataChecksumsAtSCM(long containerID, int expectedSize)
throws Exception {
@@ -592,15 +592,16 @@ private Pair<Long, byte[]> getDataAndContainer(boolean
close, int dataLen, Strin
byte[] data = randomAlphabetic(dataLen).getBytes(UTF_8);
// Write Key
- try (OzoneOutputStream os = TestHelper.createKey(KEY_NAME, RATIS, THREE,
dataLen, store, volumeName, bucketName)) {
+ try (OzoneOutputStream os = OzoneTestHelper.createKey(
+ KEY_NAME, RATIS, THREE, dataLen, store, volumeName, bucketName)) {
IOUtils.write(data, os);
}
long containerID = bucket.getKey(KEY_NAME).getOzoneKeyLocations().stream()
.findFirst().get().getContainerID();
if (close) {
- TestHelper.waitForContainerClose(cluster, containerID);
- TestHelper.waitForScmContainerState(cluster, containerID,
HddsProtos.LifeCycleState.CLOSED);
+ OzoneTestHelper.waitForContainerClose(cluster, containerID);
+ OzoneTestHelper.waitForScmContainerState(cluster, containerID,
HddsProtos.LifeCycleState.CLOSED);
}
return Pair.of(containerID, data);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/container/TestDuplicateContainerDirScannerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/container/TestDuplicateContainerDirScannerIntegration.java
index fc5216149ac..5f435b567ea 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/container/TestDuplicateContainerDirScannerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/container/TestDuplicateContainerDirScannerIntegration.java
@@ -50,7 +50,7 @@
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils;
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
@@ -156,7 +156,7 @@ private long writeKeyAndCloseContainer(String keyName)
throws Exception {
byte[] data = ContainerTestHelper
.getFixedLengthString("sample", 1024 * 1024)
.getBytes(UTF_8);
- try (OzoneOutputStream out = TestHelper.createKey(
+ try (OzoneOutputStream out = OzoneTestHelper.createKey(
keyName, RATIS, ONE, 0, store, volumeName, bucketName)) {
out.write(data);
out.flush();
@@ -169,7 +169,7 @@ private long writeKeyAndCloseContainer(String keyName)
throws Exception {
cluster.getStorageContainerLocationClient().closeContainer(containerId);
GenericTestUtils.waitFor(
- () -> TestHelper.isContainerClosed(cluster, containerId,
+ () -> OzoneTestHelper.isContainerClosed(cluster, containerId,
cluster.getHddsDatanodes().get(0).getDatanodeDetails()),
1000, 15000);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
index 8defc894c9d..3549edbe1e7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
@@ -48,7 +48,7 @@
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.hadoop.ozone.container.checksum.ContainerMerkleTreeTestUtils;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import
org.apache.hadoop.ozone.container.ozoneimpl.ContainerScannerConfiguration;
@@ -167,7 +167,7 @@ protected void closeContainerAndWait(long containerID)
throws Exception {
cluster.getStorageContainerLocationClient().closeContainer(containerID);
GenericTestUtils.waitFor(
- () -> TestHelper.isContainerClosed(cluster, containerID,
+ () -> OzoneTestHelper.isContainerClosed(cluster, containerID,
cluster.getHddsDatanodes().get(0).getDatanodeDetails()),
1000, 5000);
@@ -217,7 +217,7 @@ protected GenericTestUtils.LogCapturer
getContainerLogCapturer() {
}
private OzoneOutputStream createKey(String keyName) throws Exception {
- return TestHelper.createKey(
+ return OzoneTestHelper.createKey(
keyName, RATIS, ONE, 0, store, volumeName, bucketName);
}
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 54e8cabc11f..814903f938b 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
@@ -24,7 +24,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.tag.Unhealthy;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.statemachine.StateMachine;
@@ -112,6 +112,6 @@ private void startFreon() {
}
private StateMachine getStateMachine() throws Exception {
- return TestHelper.getStateMachine(cluster);
+ return OzoneTestHelper.getStateMachine(cluster);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestReplicationConfigPreference.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestReplicationConfigPreference.java
index c132f96d0a8..4f8c1e01c3f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestReplicationConfigPreference.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestReplicationConfigPreference.java
@@ -47,7 +47,7 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneKeyDetails;
import org.apache.hadoop.ozone.client.OzoneVolume;
-import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.hadoop.ozone.container.OzoneTestHelper;
import org.apache.ozone.test.NonHATests;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -109,7 +109,7 @@ void shutdown() {
IOUtils.closeQuietly(client);
OzoneConfiguration conf = cluster.getOzoneManager().getConfiguration();
- originalSettings.forEach((k, v) -> TestHelper.setConfig(conf, k, v));
+ originalSettings.forEach((k, v) -> OzoneTestHelper.setConfig(conf, k, v));
}
private static void execute(OzoneShell shell, List<String> args) {
@@ -240,8 +240,8 @@ private void updateReplicationInOM(ReplicationConfig
replicationConfig) {
private void updateReplicationInOM(@Nullable String type, @Nullable String
params) {
OzoneConfiguration conf = cluster.getOzoneManager().getConfiguration();
- TestHelper.setConfig(conf, OZONE_SERVER_DEFAULT_REPLICATION_TYPE_KEY,
type);
- TestHelper.setConfig(conf, OZONE_SERVER_DEFAULT_REPLICATION_KEY, params);
+ OzoneTestHelper.setConfig(conf, OZONE_SERVER_DEFAULT_REPLICATION_TYPE_KEY,
type);
+ OzoneTestHelper.setConfig(conf, OZONE_SERVER_DEFAULT_REPLICATION_KEY,
params);
cluster.getOzoneManager().setReplicationFromConfig();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
