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 d4fed1c90ea HDDS-15812. Rename test utils for naming convention
(#10766)
d4fed1c90ea is described below
commit d4fed1c90ea653234d186b5ee4165f377646bb31
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jul 15 07:44:56 2026 +0200
HDDS-15812. Rename test utils for naming convention (#10766)
---
.../utils/{TestUtils.java => RocksTestUtils.java} | 4 +--
.../utils/db/TestManagedRawSSTFileIterator.java | 4 +--
.../hadoop/hdds/utils/db/TestSstFileSetReader.java | 6 ++--
.../AbstractTestStorageDistributionEndpoint.java | 14 ++++-----
...ndpointUtil.java => ReconEndpointTestUtil.java} | 6 ++--
.../ozone/recon/TestReconAndAdminContainerCLI.java | 36 +++++++++++-----------
.../TestReplicationManagerIntegration.java | 8 ++---
.../node/{TestNodeUtil.java => NodeTestUtil.java} | 4 +--
.../scm/node/TestDecommissionAndMaintenance.java | 16 +++++-----
...UpgradeUtils.java => HddsUpgradeTestUtils.java} | 6 ++--
.../TestDNDataDistributionFinalization.java | 4 +--
.../hadoop/hdds/upgrade/TestHDDSUpgrade.java | 24 +++++++--------
.../TestScmDataDistributionFinalization.java | 12 ++++----
.../hadoop/hdds/upgrade/TestScmHAFinalization.java | 20 ++++++------
.../client/rpc/read/TestChunkInputStream.java | 10 +++---
.../ozone/client/rpc/read/TestKeyInputStream.java | 28 ++++++++---------
.../rpc/read/TestStreamBlockInputStream.java | 10 +++---
.../ozone/client/rpc/read/TestStreamRead.java | 6 ++--
.../rpc/read/TestStreamReadDatanodeFailover.java | 4 +--
.../om/{TestBucket.java => BucketForTesting.java} | 10 +++---
.../ozone/om/service/TestBlockDeletionService.java | 4 +--
.../hadoop/ozone/scm/node/TestDiskBalancer.java | 4 +--
...skBalancerDuringDecommissionAndMaintenance.java | 4 +--
23 files changed, 122 insertions(+), 122 deletions(-)
diff --git
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestUtils.java
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/RocksTestUtils.java
similarity index 96%
rename from
hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestUtils.java
rename to
hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/RocksTestUtils.java
index 0e0d8306759..0a59509a721 100644
---
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestUtils.java
+++
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/RocksTestUtils.java
@@ -31,9 +31,9 @@
/**
* Class containing test utils.
*/
-public final class TestUtils {
+public final class RocksTestUtils {
- private TestUtils() {
+ private RocksTestUtils() {
}
public static List<Optional<String>> getTestingBounds(
diff --git
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestManagedRawSSTFileIterator.java
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestManagedRawSSTFileIterator.java
index fee69e6ba18..f7a700b172f 100644
---
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestManagedRawSSTFileIterator.java
+++
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestManagedRawSSTFileIterator.java
@@ -39,7 +39,7 @@
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.hdds.StringUtils;
import org.apache.hadoop.hdds.utils.NativeLibraryNotLoadedException;
-import org.apache.hadoop.hdds.utils.TestUtils;
+import org.apache.hadoop.hdds.utils.RocksTestUtils;
import org.apache.hadoop.hdds.utils.db.managed.ManagedEnvOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedSlice;
@@ -121,7 +121,7 @@ public void testSSTDumpIteratorWithKeyFormat(String
keyFormat, String valueForma
try (ManagedOptions options = new ManagedOptions();
ManagedRawSSTFileReader reader = new ManagedRawSSTFileReader(
options, file.getAbsolutePath(), 2 * 1024 * 1024)) {
- List<Optional<String>> testBounds =
TestUtils.getTestingBounds(keys.keySet().stream()
+ List<Optional<String>> testBounds =
RocksTestUtils.getTestingBounds(keys.keySet().stream()
.collect(Collectors.toMap(Pair::getKey, Pair::getValue, (v1, v2) ->
v1, TreeMap::new)));
for (Optional<String> keyStart : testBounds) {
for (Optional<String> keyEnd : testBounds) {
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/hadoop/hdds/utils/db/TestSstFileSetReader.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/hadoop/hdds/utils/db/TestSstFileSetReader.java
index fd4bcbb6d90..0d247fc26c1 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/hadoop/hdds/utils/db/TestSstFileSetReader.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/hadoop/hdds/utils/db/TestSstFileSetReader.java
@@ -38,7 +38,7 @@
import java.util.stream.IntStream;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.hdds.StringUtils;
-import org.apache.hadoop.hdds.utils.TestUtils;
+import org.apache.hadoop.hdds.utils.RocksTestUtils;
import org.apache.hadoop.hdds.utils.db.managed.ManagedEnvOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedSstFileWriter;
@@ -159,7 +159,7 @@ public void testGetKeyStream(int numberOfFiles)
// Getting every possible combination of 2 elements from the sampled keys.
// Reading the sst file lying within the given bounds and
// validating the keys read from the sst file.
- List<Optional<String>> bounds = TestUtils.getTestingBounds(keys);
+ List<Optional<String>> bounds = RocksTestUtils.getTestingBounds(keys);
for (Optional<String> lowerBound : bounds) {
for (Optional<String> upperBound : bounds) {
// Calculating the expected keys which lie in the given boundary.
@@ -202,7 +202,7 @@ public void testGetKeyStreamWithTombstone(int numberOfFiles)
// Getting every possible combination of 2 elements from the sampled keys.
// Reading the sst file lying within the given bounds and
// validating the keys read from the sst file.
- List<Optional<String>> bounds = TestUtils.getTestingBounds(keys);
+ List<Optional<String>> bounds = RocksTestUtils.getTestingBounds(keys);
for (Optional<String> lowerBound : bounds) {
for (Optional<String> upperBound : bounds) {
// Calculating the expected keys which lie in the given boundary.
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/AbstractTestStorageDistributionEndpoint.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/AbstractTestStorageDistributionEndpoint.java
index aeba50400a9..ee63904be59 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/AbstractTestStorageDistributionEndpoint.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/AbstractTestStorageDistributionEndpoint.java
@@ -24,7 +24,7 @@
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL;
-import static
org.apache.hadoop.ozone.recon.TestReconEndpointUtil.getReconWebAddress;
+import static
org.apache.hadoop.ozone.recon.ReconEndpointTestUtil.getReconWebAddress;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -215,7 +215,7 @@ protected boolean
verifyStorageDistributionAfterKeyCreation() {
syncDataFromOM();
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(STORAGE_DIST_ENDPOINT);
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
StorageCapacityDistributionResponse storageResponse =
MAPPER.readValue(response,
StorageCapacityDistributionResponse.class);
@@ -279,7 +279,7 @@ protected boolean verifyPendingDeletionAfterKeyDeletionOm()
{
syncDataFromOM();
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(PENDING_DELETION_ENDPOINT).append("?component=om");
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
Map<String, Number> pendingDeletionMap = MAPPER.readValue(response,
Map.class);
assertEquals(300L, pendingDeletionMap.get("totalSize").longValue());
assertEquals(300L,
pendingDeletionMap.get("pendingDirectorySize").longValue() +
@@ -295,7 +295,7 @@ protected boolean
verifyPendingDeletionAfterKeyDeletionScm() {
try {
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(PENDING_DELETION_ENDPOINT).append("?component=scm");
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
ScmPendingDeletion pendingDeletion = MAPPER.readValue(response,
ScmPendingDeletion.class);
assertEquals(300, pendingDeletion.getTotalReplicatedBlockSize());
assertEquals(100, pendingDeletion.getTotalBlocksize());
@@ -312,7 +312,7 @@ protected boolean verifyPendingDeletionAfterKeyDeletionDn()
{
scm.getScmHAManager().asSCMHADBTransactionBuffer().flush();
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(PENDING_DELETION_ENDPOINT).append("?component=dn");
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
DataNodeMetricsCompleteResponse pendingDeletion =
MAPPER.readValue(response, DataNodeMetricsCompleteResponse.class);
assertNotNull(pendingDeletion);
@@ -335,7 +335,7 @@ protected boolean verifyPendingDeletionClearsAtDn() {
scm.getScmHAManager().asSCMHADBTransactionBuffer().flush();
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(PENDING_DELETION_ENDPOINT).append("?component=dn");
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
DataNodeMetricsCompleteResponse pendingDeletion =
MAPPER.readValue(response, DataNodeMetricsCompleteResponse.class);
assertNotNull(pendingDeletion);
@@ -357,7 +357,7 @@ protected boolean
verifyPendingDeletionAfterKeyDeletionOnDnFailure() {
try {
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(PENDING_DELETION_ENDPOINT).append("?component=dn");
- String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
+ String response = ReconEndpointTestUtil.makeHttpCall(conf, urlBuilder);
DataNodeMetricsCompleteResponse pendingDeletion =
MAPPER.readValue(response, DataNodeMetricsCompleteResponse.class);
assertNotNull(pendingDeletion);
diff --git
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconEndpointUtil.java
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconEndpointTestUtil.java
similarity index 97%
rename from
hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconEndpointUtil.java
rename to
hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconEndpointTestUtil.java
index 4acafc10581..60352669208 100644
---
a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconEndpointUtil.java
+++
b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconEndpointTestUtil.java
@@ -50,15 +50,15 @@
* Utility class, used by integration tests,
* for getting responses from Recon Endpoints.
*/
-public final class TestReconEndpointUtil {
+public final class ReconEndpointTestUtil {
private static final Logger LOG =
- LoggerFactory.getLogger(TestReconEndpointUtil.class);
+ LoggerFactory.getLogger(ReconEndpointTestUtil.class);
private static final String CONTAINER_ENDPOINT = "/api/v1/containers";
private static final String OM_DB_SYNC_ENDPOINT = "/api/v1/triggerdbsync/om";
- private TestReconEndpointUtil() {
+ private ReconEndpointTestUtil() {
}
public static void triggerReconDbSyncWithOm(
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 f1c41e9d53d..19af93bd7bc 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
@@ -63,7 +63,7 @@
import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.hdds.scm.node.NodeManager;
-import org.apache.hadoop.hdds.scm.node.TestNodeUtil;
+import org.apache.hadoop.hdds.scm.node.NodeTestUtil;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
@@ -225,7 +225,7 @@ void testMissingContainer() throws Exception {
for (DatanodeDetails details : pipeline.getNodes()) {
cluster.restartHddsDatanode(details, false);
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager, details,
IN_SERVICE);
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager, details,
IN_SERVICE);
}
}
@@ -254,19 +254,19 @@ void testNodesInDecommissionOrMaintenance(
// First node goes offline.
if (isMaintenance) {
scmClient.startMaintenanceNodes(Collections.singletonList(
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline1)), 0, true);
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline1)), 0, true);
} else {
scmClient.decommissionNodes(Collections.singletonList(
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline1)), false);
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline1)), false);
}
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline1, initialState);
compareRMReportToReconResponse(underReplicatedState);
compareRMReportToReconResponse(overReplicatedState);
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline1, finalState);
// Every time a node goes into decommission,
// a new replica-copy is made to another node.
@@ -281,19 +281,19 @@ void testNodesInDecommissionOrMaintenance(
// Second node goes offline.
if (isMaintenance) {
scmClient.startMaintenanceNodes(Collections.singletonList(
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline2)), 0, true);
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline2)), 0, true);
} else {
scmClient.decommissionNodes(Collections.singletonList(
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline2)), false);
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline2)), false);
}
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline2, initialState);
compareRMReportToReconResponse(underReplicatedState);
compareRMReportToReconResponse(overReplicatedState);
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline2, finalState);
// There will be a replica copy for both maintenance and decommission.
@@ -305,16 +305,16 @@ void testNodesInDecommissionOrMaintenance(
compareRMReportToReconResponse(overReplicatedState);
scmClient.recommissionNodes(Arrays.asList(
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline1),
- TestNodeUtil.getDNHostAndPort(nodeToGoOffline2)));
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline1),
+ NodeTestUtil.getDNHostAndPort(nodeToGoOffline2)));
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline1, IN_SERVICE);
- TestNodeUtil.waitForDnToReachOpState(scmNodeManager,
+ NodeTestUtil.waitForDnToReachOpState(scmNodeManager,
nodeToGoOffline2, IN_SERVICE);
- TestNodeUtil.waitForDnToReachPersistedOpState(nodeToGoOffline1,
IN_SERVICE);
- TestNodeUtil.waitForDnToReachPersistedOpState(nodeToGoOffline2,
IN_SERVICE);
+ NodeTestUtil.waitForDnToReachPersistedOpState(nodeToGoOffline1,
IN_SERVICE);
+ NodeTestUtil.waitForDnToReachPersistedOpState(nodeToGoOffline2,
IN_SERVICE);
compareRMReportToReconResponse(underReplicatedState);
compareRMReportToReconResponse(overReplicatedState);
@@ -345,7 +345,7 @@ private static boolean
assertReportsMatch(UnHealthyContainerStates state) {
try {
rmReport = scmClient.getReplicationManagerReport();
- reconResponse = TestReconEndpointUtil
+ reconResponse = ReconEndpointTestUtil
.getUnhealthyContainersFromRecon(CONF, state);
assertEquals(rmReport.getStat(ContainerHealthState.MISSING),
reconResponse.getMissingCount());
@@ -400,7 +400,7 @@ private static long setupRatisKey(ReconService
reconService, String keyName,
RatisReplicationConfig.getInstance(replicationFactor));
// Sync Recon with OM, to force it to get the new key entries.
- TestReconEndpointUtil.triggerReconDbSyncWithOm(CONF);
+ ReconEndpointTestUtil.triggerReconDbSyncWithOm(CONF);
List<Long> containerIDs = getContainerIdsForKey(omKeyInfo);
// The list has only 1 containerID.
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerIntegration.java
index 14f4c849180..a1855fe9a75 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerIntegration.java
@@ -36,10 +36,10 @@
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_DESTROY_TIMEOUT;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_SCRUB_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import static org.apache.hadoop.hdds.scm.node.TestNodeUtil.getDNHostAndPort;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachHealthState;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachOpState;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachPersistedOpState;
+import static org.apache.hadoop.hdds.scm.node.NodeTestUtil.getDNHostAndPort;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachHealthState;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachOpState;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachPersistedOpState;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_CLOSE_CONTAINER_WAIT_DURATION;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeUtil.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/NodeTestUtil.java
similarity index 98%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeUtil.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/NodeTestUtil.java
index fbb0b5aa0b2..57384c47c3a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeUtil.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/NodeTestUtil.java
@@ -26,9 +26,9 @@
/**
* Utility class with helper methods for testing node state and status.
*/
-public final class TestNodeUtil {
+public final class NodeTestUtil {
- private TestNodeUtil() {
+ private NodeTestUtil() {
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
index 2871af693d7..7ccc131f53f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
@@ -34,10 +34,10 @@
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import static org.apache.hadoop.hdds.scm.node.TestNodeUtil.getDNHostAndPort;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachHealthState;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachOpState;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachPersistedOpState;
+import static org.apache.hadoop.hdds.scm.node.NodeTestUtil.getDNHostAndPort;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachHealthState;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachOpState;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachPersistedOpState;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -503,7 +503,7 @@ public void
testContainerIsReplicatedWhenAllNodesGotoMaintenance()
replicas.forEach(r -> forMaintenance.add(r.getDatanodeDetails()));
scmClient.startMaintenanceNodes(forMaintenance.stream()
- .map(TestNodeUtil::getDNHostAndPort)
+ .map(NodeTestUtil::getDNHostAndPort)
.collect(Collectors.toList()), 0, true);
// Ensure all 3 DNs go to maintenance
@@ -537,14 +537,14 @@ public void
testContainerIsReplicatedWhenAllNodesGotoMaintenance()
.limit(2)
.collect(Collectors.toList());
scmClient.startMaintenanceNodes(ecMaintenance.stream()
- .map(TestNodeUtil::getDNHostAndPort)
+ .map(NodeTestUtil::getDNHostAndPort)
.collect(Collectors.toList()), 0, true);
for (DatanodeDetails dn : ecMaintenance) {
waitForDnToReachPersistedOpState(dn, IN_MAINTENANCE);
}
assertThat(cm.getContainerReplicas(ecContainer.containerID()).size()).isGreaterThanOrEqualTo(6);
scmClient.recommissionNodes(ecMaintenance.stream()
- .map(TestNodeUtil::getDNHostAndPort)
+ .map(NodeTestUtil::getDNHostAndPort)
.collect(Collectors.toList()));
// Ensure the 2 DNs go to IN_SERVICE
for (DatanodeDetails dn : ecMaintenance) {
@@ -571,7 +571,7 @@ public void
testEnteringMaintenanceNodeCompletesAfterSCMRestart()
replicas.forEach(r -> forMaintenance.add(r.getDatanodeDetails()));
scmClient.startMaintenanceNodes(forMaintenance.stream()
- .map(TestNodeUtil::getDNHostAndPort)
+ .map(NodeTestUtil::getDNHostAndPort)
.collect(Collectors.toList()), 0, true);
// Ensure all 3 DNs go to entering_maintenance
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
similarity index 98%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
index aa7c78b2e5a..eea584643e6 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHddsUpgradeUtils.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/HddsUpgradeTestUtils.java
@@ -56,15 +56,15 @@
/**
* Helper methods for testing HDDS upgrade finalization in integration tests.
*/
-public final class TestHddsUpgradeUtils {
+public final class HddsUpgradeTestUtils {
- private static final Logger LOG =
LoggerFactory.getLogger(TestHddsUpgradeUtils.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(HddsUpgradeTestUtils.class);
private static final ReplicationConfig RATIS_THREE =
ReplicationConfig.fromProtoTypeAndFactor(HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.THREE);
- private TestHddsUpgradeUtils() { }
+ private HddsUpgradeTestUtils() { }
public static void waitForFinalizationFromClient(
StorageContainerLocationProtocol scmClient, String clientID)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestDNDataDistributionFinalization.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestDNDataDistributionFinalization.java
index d714a955b0a..8c7daace078 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestDNDataDistributionFinalization.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestDNDataDistributionFinalization.java
@@ -180,7 +180,7 @@ public void testDataDistributionUpgradeScenario() throws
Exception {
// Wait for finalization to complete
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Verify finalization completed
assertEquals(HDDSLayoutFeature.STORAGE_SPACE_DISTRIBUTION.layoutVersion(),
@@ -226,7 +226,7 @@ public void testMissingPendingDeleteMetadataRecalculation()
throws Exception {
});
// Wait for finalization
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
assertEquals(HDDSLayoutFeature.STORAGE_SPACE_DISTRIBUTION.layoutVersion(),
cluster.getStorageContainerManager().getLayoutVersionManager().getMetadataLayoutVersion());
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 4b612729583..c0435088d25 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
@@ -273,9 +273,9 @@ public void
testFinalizationFromInitialVersionToLatestVersion()
createTestContainers();
// Test the Pre-Upgrade conditions on SCM as well as DataNodes.
- TestHddsUpgradeUtils.testPreUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPreUpgradeConditionsSCM(
cluster.getStorageContainerManagersList());
- TestHddsUpgradeUtils.testPreUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPreUpgradeConditionsDataNodes(
cluster.getHddsDatanodes());
Set<PipelineID> preUpgradeOpenPipelines =
@@ -290,7 +290,7 @@ public void
testFinalizationFromInitialVersionToLatestVersion()
assertEquals(STARTING_FINALIZATION, status.status());
// Wait for the Finalization to complete on the SCM.
- TestHddsUpgradeUtils.waitForFinalizationFromClient(
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(
cluster.getStorageContainerLocationClient(), "xyz");
Set<PipelineID> postUpgradeOpenPipelines =
@@ -308,19 +308,19 @@ public void
testFinalizationFromInitialVersionToLatestVersion()
assertEquals(0, numPreUpgradeOpenPipelines);
// Verify Post-Upgrade conditions on the SCM.
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(),
NUM_CONTAINERS_CREATED, NUM_DATA_NODES);
// All datanodes on the SCM should have moved to HEALTHY-READONLY state.
- TestHddsUpgradeUtils.testDataNodesStateOnSCM(
+ HddsUpgradeTestUtils.testDataNodesStateOnSCM(
cluster.getStorageContainerManagersList(), NUM_DATA_NODES,
HEALTHY_READONLY, HEALTHY);
// Verify the SCM has driven all the DataNodes through Layout Upgrade.
// In the happy path case, no containers should have been quasi closed as
// a result of the upgrade.
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), NUM_CONTAINERS_CREATED, CLOSED);
// Test that we can use a pipeline after upgrade.
@@ -832,9 +832,9 @@ public void testFinalizationWithFailureInjectionHelper(
createKey();
// Test the Pre-Upgrade conditions on SCM as well as DataNodes.
- TestHddsUpgradeUtils.testPreUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPreUpgradeConditionsSCM(
cluster.getStorageContainerManagersList());
- TestHddsUpgradeUtils.testPreUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPreUpgradeConditionsDataNodes(
cluster.getHddsDatanodes());
// Trigger Finalization on the SCM
@@ -864,14 +864,14 @@ public void testFinalizationWithFailureInjectionHelper(
// Verify Post-Upgrade conditions on the SCM.
// With failure injection
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(), NUM_CONTAINERS_CREATED,
NUM_DATA_NODES);
// All datanodes on the SCM should have moved to HEALTHY-READONLY state.
// Due to timing constraint also allow a "HEALTHY" state.
loadSCMState();
- TestHddsUpgradeUtils.testDataNodesStateOnSCM(
+ HddsUpgradeTestUtils.testDataNodesStateOnSCM(
cluster.getStorageContainerManagersList(), NUM_DATA_NODES,
HEALTHY_READONLY, HEALTHY);
@@ -879,7 +879,7 @@ public void testFinalizationWithFailureInjectionHelper(
LambdaTestUtils.await(600000, 500, () -> {
try {
loadSCMState();
- TestHddsUpgradeUtils.testDataNodesStateOnSCM(
+ HddsUpgradeTestUtils.testDataNodesStateOnSCM(
cluster.getStorageContainerManagersList(), NUM_DATA_NODES,
HEALTHY, null);
sleep(100);
@@ -891,7 +891,7 @@ public void testFinalizationWithFailureInjectionHelper(
});
// Verify the SCM has driven all the DataNodes through Layout Upgrade.
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), NUM_CONTAINERS_CREATED);
// Verify that new pipeline can be created with upgraded datanodes.
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
index 148221fc01a..3fb1bc121af 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
@@ -195,15 +195,15 @@ public void
testFinalizationEmptyClusterDataDistribution() throws Exception {
assertEquals(EMPTY_SUMMARY,
cluster.getStorageContainerLocationClient().getDeletedBlockSummary());
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Make sure old leader has caught up and all SCMs have finalized.
waitForScmsToFinalize(cluster.getStorageContainerManagersList());
assertEquals(HDDSLayoutFeature.STORAGE_SPACE_DISTRIBUTION.layoutVersion(),
cluster.getStorageContainerManager().getLayoutVersionManager().getMetadataLayoutVersion());
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(), 0, NUM_DATANODES);
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), 0, CLOSED);
assertNotNull(cluster.getStorageContainerLocationClient().getDeletedBlockSummary());
@@ -309,15 +309,15 @@ public void
testFinalizationNonEmptyClusterDataDistribution() throws Exception {
}
});
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Make sure old leader has caught up and all SCMs have finalized.
waitForScmsToFinalize(cluster.getStorageContainerManagersList());
assertEquals(HDDSLayoutFeature.STORAGE_SPACE_DISTRIBUTION.layoutVersion(),
cluster.getStorageContainerManager().getLayoutVersionManager().getMetadataLayoutVersion());
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(), 0, NUM_DATANODES);
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), 0, CLOSED);
assertNotNull(cluster.getStorageContainerLocationClient().getDeletedBlockSummary());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
index e4960cce160..c0e64ac4cac 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
@@ -183,13 +183,13 @@ public void testFinalizationWithLeaderChange(
// Client should complete exceptionally since the original SCM it
// requested to was restarted.
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Make sure old leader has caught up and all SCMs have finalized.
waitForScmsToFinalize(cluster.getStorageContainerManagersList());
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(), 0, NUM_DATANODES);
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), 0, CLOSED);
}
@@ -229,14 +229,14 @@ public void testFinalizationWithRestart(
cluster.waitForClusterToBeReady();
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Once the leader tells the client finalization is complete, wait for all
// followers to catch up so we can check their state.
waitForScmsToFinalize(cluster.getStorageContainerManagersList());
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
cluster.getStorageContainerManagersList(), 0, NUM_DATANODES);
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), 0, CLOSED);
}
@@ -268,13 +268,13 @@ public void testSnapshotFinalization() throws Exception {
// Wait for finalization from the client perspective.
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
// Wait for two running SCMs to finish finalization.
waitForScmsToFinalize(activeScms);
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
activeScms, 0, NUM_DATANODES);
- TestHddsUpgradeUtils.testPostUpgradeConditionsDataNodes(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsDataNodes(
cluster.getHddsDatanodes(), 0, CLOSED);
// Move SCM log index farther ahead to make sure a snapshot install
@@ -290,7 +290,7 @@ public void testSnapshotFinalization() throws Exception {
cluster.startInactiveSCM(inactiveScm.getSCMNodeId());
waitForScmToFinalize(inactiveScm);
- TestHddsUpgradeUtils.testPostUpgradeConditionsSCM(
+ HddsUpgradeTestUtils.testPostUpgradeConditionsSCM(
inactiveScm, 0, NUM_DATANODES);
// Use log to verify a snapshot was installed.
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
index 57f0ebcecf9..4dce1e8b433 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
@@ -31,7 +31,7 @@
import org.apache.hadoop.ozone.client.io.KeyInputStream;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.keyvalue.ContainerLayoutTestInfo;
-import org.apache.hadoop.ozone.om.TestBucket;
+import org.apache.hadoop.ozone.om.BucketForTesting;
import org.junit.jupiter.api.TestInstance;
/**
@@ -49,7 +49,7 @@ void testAll(ContainerLayoutVersion layout) throws Exception {
try (OzoneClient client = getCluster().newClient()) {
updateConfig(layout);
- TestBucket bucket = TestBucket.newBuilder(client).build();
+ BucketForTesting bucket = BucketForTesting.newBuilder(client).build();
testChunkReadBuffers(bucket);
testBufferRelease(bucket);
@@ -61,7 +61,7 @@ void testAll(ContainerLayoutVersion layout) throws Exception {
* Test to verify that data read from chunks is stored in a list of buffers
* with max capacity equal to the bytes per checksum.
*/
- private void testChunkReadBuffers(TestBucket bucket) throws Exception {
+ private void testChunkReadBuffers(BucketForTesting bucket) throws Exception {
String keyName = getNewKeyName();
int dataLength = (2 * BLOCK_SIZE) + (CHUNK_SIZE);
byte[] inputData = bucket.writeRandomBytes(keyName, dataLength);
@@ -123,7 +123,7 @@ private void testChunkReadBuffers(TestBucket bucket) throws
Exception {
}
}
- private void testCloseReleasesBuffers(TestBucket bucket) throws Exception {
+ private void testCloseReleasesBuffers(BucketForTesting bucket) throws
Exception {
String keyName = getNewKeyName();
bucket.writeRandomBytes(keyName, CHUNK_SIZE);
@@ -146,7 +146,7 @@ private void testCloseReleasesBuffers(TestBucket bucket)
throws Exception {
* Test that ChunkInputStream buffers are released as soon as the last byte
* of the buffer is read.
*/
- private void testBufferRelease(TestBucket bucket) throws Exception {
+ private void testBufferRelease(BucketForTesting bucket) throws Exception {
String keyName = getNewKeyName();
byte[] inputData = bucket.writeRandomBytes(keyName, CHUNK_SIZE);
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 50dae1ee2d3..aec35fa2f75 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
@@ -47,7 +47,7 @@
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import org.apache.hadoop.ozone.container.keyvalue.ContainerLayoutTestInfo;
-import org.apache.hadoop.ozone.om.TestBucket;
+import org.apache.hadoop.ozone.om.BucketForTesting;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@@ -70,7 +70,7 @@ class TestKeyInputStream extends InputStreamTests {
* This method does random seeks and reads and validates the reads are
* correct or not.
*/
- private void randomSeek(TestBucket bucket, int dataLength,
+ private void randomSeek(BucketForTesting bucket, int dataLength,
KeyInputStream keyInputStream, byte[] inputData) throws Exception {
// Do random seek.
for (int i = 0; i < dataLength - 300; i += 20) {
@@ -94,7 +94,7 @@ private void randomSeek(TestBucket bucket, int dataLength,
* This method does random seeks and reads and validates the reads are
* correct or not.
*/
- private void randomPositionSeek(TestBucket bucket, int dataLength,
+ private void randomPositionSeek(BucketForTesting bucket, int dataLength,
KeyInputStream keyInputStream,
byte[] inputData, int readSize) throws Exception {
for (int i = 0; i < 100; i++) {
@@ -107,7 +107,7 @@ private void randomPositionSeek(TestBucket bucket, int
dataLength,
* This method seeks to specified seek value and read the data specified by
* readLength and validate the read is correct or not.
*/
- private void validate(TestBucket bucket, KeyInputStream keyInputStream,
+ private void validate(BucketForTesting bucket, KeyInputStream keyInputStream,
byte[] inputData, long seek, int readLength) throws Exception {
keyInputStream.seek(seek);
@@ -126,7 +126,7 @@ void testNonReplicationReads(ContainerLayoutVersion layout)
throws Exception {
try (OzoneClient client = getCluster().newClient()) {
updateConfig(layout);
- TestBucket bucket = TestBucket.newBuilder(client).build();
+ BucketForTesting bucket = BucketForTesting.newBuilder(client).build();
testInputStreams(bucket);
testSeekRandomly(bucket);
@@ -138,7 +138,7 @@ void testNonReplicationReads(ContainerLayoutVersion layout)
throws Exception {
}
}
- private void testInputStreams(TestBucket bucket) throws Exception {
+ private void testInputStreams(BucketForTesting bucket) throws Exception {
String keyName = getNewKeyName();
int dataLength = (2 * BLOCK_SIZE) + (CHUNK_SIZE) + 1;
bucket.writeRandomBytes(keyName, dataLength);
@@ -178,7 +178,7 @@ private void testInputStreams(TestBucket bucket) throws
Exception {
}
}
- private void testSeekRandomly(TestBucket bucket) throws Exception {
+ private void testSeekRandomly(BucketForTesting bucket) throws Exception {
String keyName = getNewKeyName();
int dataLength = (2 * BLOCK_SIZE) + (CHUNK_SIZE);
byte[] inputData = bucket.writeRandomBytes(keyName, dataLength);
@@ -208,7 +208,7 @@ private void testSeekRandomly(TestBucket bucket) throws
Exception {
keyInputStream.close();
}
- public void testECSeek(TestBucket bucket) throws Exception {
+ public void testECSeek(BucketForTesting bucket) throws Exception {
int ecChunkSize = 1024 * 1024;
ECReplicationConfig repConfig = new ECReplicationConfig(3, 2, RS,
ecChunkSize);
@@ -239,7 +239,7 @@ public void testECSeek(TestBucket bucket) throws Exception {
}
}
- public void testSeek(TestBucket bucket) throws Exception {
+ public void testSeek(BucketForTesting bucket) throws Exception {
XceiverClientManager.resetXceiverClientMetrics();
XceiverClientMetrics metrics = XceiverClientManager
.getXceiverClientMetrics();
@@ -284,7 +284,7 @@ public void testSeek(TestBucket bucket) throws Exception {
}
}
- private void testReadChunkWithByteArray(TestBucket bucket) throws Exception {
+ private void testReadChunkWithByteArray(BucketForTesting bucket) throws
Exception {
String keyName = getNewKeyName();
// write data spanning multiple blocks/chunks
@@ -304,7 +304,7 @@ private void testReadChunkWithByteArray(TestBucket bucket)
throws Exception {
}
}
- public void testReadChunkWithByteBuffer(TestBucket bucket) throws Exception {
+ public void testReadChunkWithByteBuffer(BucketForTesting bucket) throws
Exception {
String keyName = getNewKeyName();
// write data spanning multiple blocks/chunks
@@ -324,7 +324,7 @@ public void testReadChunkWithByteBuffer(TestBucket bucket)
throws Exception {
}
}
- private void testSkip(TestBucket bucket) throws Exception {
+ private void testSkip(BucketForTesting bucket) throws Exception {
XceiverClientManager.resetXceiverClientMetrics();
XceiverClientMetrics metrics = XceiverClientManager
.getXceiverClientMetrics();
@@ -382,13 +382,13 @@ private void testSkip(TestBucket bucket) throws Exception
{
@Order(Integer.MAX_VALUE) // shuts down datanodes
void readAfterReplication(boolean doUnbuffer) throws Exception {
try (OzoneClient client = getCluster().newClient()) {
- TestBucket bucket = TestBucket.newBuilder(client).build();
+ BucketForTesting bucket = BucketForTesting.newBuilder(client).build();
testReadAfterReplication(bucket, doUnbuffer);
}
}
- private void testReadAfterReplication(TestBucket bucket, boolean doUnbuffer)
throws Exception {
+ private void testReadAfterReplication(BucketForTesting bucket, boolean
doUnbuffer) throws Exception {
int dataLength = 2 * CHUNK_SIZE;
String keyName = getNewKeyName();
byte[] data = bucket.writeRandomBytes(keyName, dataLength);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
index 874d78ddde6..97b802e78b1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
@@ -33,7 +33,7 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyInputStream;
import
org.apache.hadoop.ozone.container.common.transport.server.GrpcXceiverService;
-import org.apache.hadoop.ozone.om.TestBucket;
+import org.apache.hadoop.ozone.om.BucketForTesting;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -71,7 +71,7 @@ public class TestStreamBlockInputStream extends
InputStreamTests {
*/
private static final int DATA_LENGTH = (2 * BLOCK_SIZE) + (CHUNK_SIZE);
private byte[] inputData;
- private TestBucket bucket;
+ private BucketForTesting bucket;
@Test
void testReadKey() throws Exception {
@@ -95,7 +95,7 @@ void runTestReadKey(int keyLength, boolean randomReadOffset,
OzoneConfiguration
copy.setFromObject(clientConfig);
String keyName = getNewKeyName();
try (OzoneClient client = OzoneClientFactory.getRpcClient(copy)) {
- bucket = TestBucket.newBuilder(client).build();
+ bucket = BucketForTesting.newBuilder(client).build();
inputData = bucket.writeRandomBytes(keyName, keyLength);
LOG.info("---------------------------------------------------------");
LOG.info("writeRandomBytes {} bytes", inputData.length);
@@ -196,7 +196,7 @@ void testAll() throws Exception {
copy.setFromObject(clientConfig);
String keyName = getNewKeyName();
try (OzoneClient client = OzoneClientFactory.getRpcClient(copy)) {
- bucket = TestBucket.newBuilder(client).build();
+ bucket = BucketForTesting.newBuilder(client).build();
inputData = bucket.writeRandomBytes(keyName, DATA_LENGTH);
testReadKeyFully(keyName);
testSeek(keyName);
@@ -206,7 +206,7 @@ void testAll() throws Exception {
clientConfig.setChecksumType(ContainerProtos.ChecksumType.NONE);
copy.setFromObject(clientConfig);
try (OzoneClient client = OzoneClientFactory.getRpcClient(copy)) {
- bucket = TestBucket.newBuilder(client).build();
+ bucket = BucketForTesting.newBuilder(client).build();
inputData = bucket.writeRandomBytes(keyName, DATA_LENGTH);
testReadKeyFully(keyName);
testSeek(keyName);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamRead.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamRead.java
index 9fc217b6df3..ee56eb38825 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamRead.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamRead.java
@@ -51,7 +51,7 @@
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
-import org.apache.hadoop.ozone.om.TestBucket;
+import org.apache.hadoop.ozone.om.BucketForTesting;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.ozone.test.GenericTestUtils;
@@ -155,7 +155,7 @@ void runTestReadKey(SizeInBytes keySize, SizeInBytes
bytesPerChecksum) throws Ex
try (OzoneClient streamReadClient =
OzoneClientFactory.getRpcClient(steamReadConf);
OzoneClient nonStreamReadClient =
OzoneClientFactory.getRpcClient(nonSteamReadConf)) {
- final TestBucket testBucket =
TestBucket.newBuilder(streamReadClient).build();
+ final BucketForTesting testBucket =
BucketForTesting.newBuilder(streamReadClient).build();
final String volume = testBucket.delegate().getVolumeName();
final String bucket = testBucket.delegate().getName();
final String keyName = "key0";
@@ -207,7 +207,7 @@ void runTestReadKey(SizeInBytes keySize, SizeInBytes
bytesPerChecksum) throws Ex
}
static void streamRead(SizeInBytes keySize, SizeInBytes bufferSize, String
expectedMD5,
- TestBucket bucket, String keyName) throws Exception {
+ BucketForTesting bucket, String keyName) throws Exception {
try (KeyInputStream in = bucket.getKeyInputStream(keyName)) {
assertTrue(in.isStreamBlockInputStream());
runTestReadKey(keySize, bufferSize, expectedMD5, in);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamReadDatanodeFailover.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamReadDatanodeFailover.java
index 27a971873be..830610a6c7f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamReadDatanodeFailover.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamReadDatanodeFailover.java
@@ -54,7 +54,7 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.KeyInputStream;
-import org.apache.hadoop.ozone.om.TestBucket;
+import org.apache.hadoop.ozone.om.BucketForTesting;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.junit.jupiter.api.AfterAll;
@@ -173,7 +173,7 @@ void testStreamReadFailoverAfterActiveDatanodeStopped()
throws Exception {
OzoneConfiguration streamConf = streamReadConfig(cluster.getConf());
try (OzoneClient streamClient =
OzoneClientFactory.getRpcClient(streamConf);
OzoneClient legacyClient = cluster.newClient()) {
- TestBucket streamBucket = TestBucket.newBuilder(streamClient).build();
+ BucketForTesting streamBucket =
BucketForTesting.newBuilder(streamClient).build();
OzoneBucket legacyBucket = legacyClient.getObjectStore()
.getVolume(streamBucket.delegate().getVolumeName())
.getBucket(streamBucket.delegate().getName());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucket.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java
similarity index 94%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucket.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java
index c4f2d1bfbfa..1720d58ee79 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucket.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java
@@ -39,11 +39,11 @@
* Wrapper for {@code OzoneBucket} for testing. Can create random keys,
* verify content, etc.
*/
-public final class TestBucket {
+public final class BucketForTesting {
private final OzoneBucket bucket;
- private TestBucket(OzoneBucket bucket) {
+ private BucketForTesting(OzoneBucket bucket) {
this.bucket = bucket;
}
@@ -105,7 +105,7 @@ public void validateData(byte[] inputData, int offset,
byte[] readData) {
}
/**
- * Builder for {@code TestBucket}.
+ * Builder for {@code BucketForTesting}.
*/
public static class Builder {
private final OzoneClient client;
@@ -117,7 +117,7 @@ public static class Builder {
this.client = client;
}
- public TestBucket build() throws IOException {
+ public BucketForTesting build() throws IOException {
ObjectStore objectStore = client.getObjectStore();
if (volume == null) { // TODO add setVolume
if (volumeName == null) { // TODO add setVolumeName
@@ -130,7 +130,7 @@ public TestBucket build() throws IOException {
bucketName = "bucket" + RandomStringUtils.secure().nextNumeric(10);
}
volume.createBucket(bucketName);
- return new TestBucket(volume.getBucket(bucketName));
+ return new BucketForTesting(volume.getBucket(bucketName));
}
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestBlockDeletionService.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestBlockDeletionService.java
index 5516107266f..3c1d3ed6faf 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestBlockDeletionService.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestBlockDeletionService.java
@@ -49,7 +49,7 @@
import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.scm.server.upgrade.SCMUpgradeFinalizationContext;
-import org.apache.hadoop.hdds.upgrade.TestHddsUpgradeUtils;
+import org.apache.hadoop.hdds.upgrade.HddsUpgradeTestUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.UniformDatanodesFactory;
import org.apache.hadoop.ozone.client.OzoneBucket;
@@ -160,7 +160,7 @@ public void testDeleteKeyQuotaWithUpgrade() throws
Exception {
}
});
finalizationFuture.get();
- TestHddsUpgradeUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
+ HddsUpgradeTestUtils.waitForFinalizationFromClient(scmClient, CLIENT_ID);
assertEquals(STORAGE_SPACE_DISTRIBUTION.ordinal(),
cluster.getStorageContainerManager().getLayoutVersionManager().getMetadataLayoutVersion());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancer.java
index 232554209c5..7d8c6b7efc6 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancer.java
@@ -19,8 +19,8 @@
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.DECOMMISSIONING;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.IN_SERVICE;
-import static org.apache.hadoop.hdds.scm.node.TestNodeUtil.getDNHostAndPort;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachOpState;
+import static org.apache.hadoop.hdds.scm.node.NodeTestUtil.getDNHostAndPort;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachOpState;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancerDuringDecommissionAndMaintenance.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancerDuringDecommissionAndMaintenance.java
index b8bee566a54..8be0e097f36 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancerDuringDecommissionAndMaintenance.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDiskBalancerDuringDecommissionAndMaintenance.java
@@ -20,8 +20,8 @@
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.DECOMMISSIONING;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.ENTERING_MAINTENANCE;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.IN_SERVICE;
-import static org.apache.hadoop.hdds.scm.node.TestNodeUtil.getDNHostAndPort;
-import static
org.apache.hadoop.hdds.scm.node.TestNodeUtil.waitForDnToReachOpState;
+import static org.apache.hadoop.hdds.scm.node.NodeTestUtil.getDNHostAndPort;
+import static
org.apache.hadoop.hdds.scm.node.NodeTestUtil.waitForDnToReachOpState;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
