You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2026/09/25 13:36:04 UTC
(ozone) branch master updated: HDDS-16601. Rename more test helpers and parents for naming convention (#11325)
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 710832575fc HDDS-16601. Rename more test helpers and parents for naming convention (#11325)
710832575fc is described below
commit 710832575fce0244ba546028faa4d2992038944c
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Sep 25 15:35:59 2026 +0200
HDDS-16601. Rename more test helpers and parents for naming convention (#11325)
---
...ruptions.java => ContainerTestCorruptions.java} | 12 ++++----
...stContainerReconciliationWithMockDatanodes.java | 4 +--
.../container/keyvalue/TestKeyValueContainer.java | 2 +-
.../keyvalue/TestKeyValueContainerCheck.java | 22 +++++++--------
...wSstFileRecords.java => RawSstFileRecords.java} | 4 +--
...estLatestVersionedKWayMergeIteratorOverSst.java | 4 +--
.../TestContainerCommandReconciliation.java | 4 +--
...tBackgroundContainerDataScannerIntegration.java | 12 ++++----
...kgroundContainerMetadataScannerIntegration.java | 18 ++++++------
.../TestOnDemandContainerScannerIntegration.java | 32 +++++++++++-----------
...> OMLifecycleConfigurationRequestTestBase.java} | 2 +-
.../TestOMLifecycleConfigurationDeleteRequest.java | 2 +-
.../TestOMLifecycleConfigurationSetRequest.java | 2 +-
13 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerCorruptions.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestCorruptions.java
similarity index 95%
rename from hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerCorruptions.java
rename to hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestCorruptions.java
index 979e8c17279..a5f0ecda57f 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerCorruptions.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestCorruptions.java
@@ -41,7 +41,7 @@
* Represents a type of container corruption that can be injected into a container for testing.
* Currently this class only supports file per block layout.
*/
-public enum TestContainerCorruptions {
+public enum ContainerTestCorruptions {
MISSING_CHUNKS_DIR((container, blockID) -> {
File chunksDir = new File(container.getContainerData().getContainerPath(),
"chunks");
@@ -116,7 +116,7 @@ public enum TestContainerCorruptions {
private final BiConsumer<Container<?>, Long> corruption;
private final ContainerScanError.FailureType expectedResult;
- TestContainerCorruptions(BiConsumer<Container<?>, Long> corruption, ContainerScanError.FailureType expectedResult) {
+ ContainerTestCorruptions(BiConsumer<Container<?>, Long> corruption, ContainerScanError.FailureType expectedResult) {
this.corruption = corruption;
this.expectedResult = expectedResult;
@@ -160,10 +160,10 @@ public ContainerScanError.FailureType getExpectedResult() {
* Get all container corruption types as parameters for junit 4
* parameterized tests, except the ones specified.
*/
- public static Set<TestContainerCorruptions> getAllParamsExcept(
- TestContainerCorruptions... exclude) {
- Set<TestContainerCorruptions> includeSet =
- EnumSet.allOf(TestContainerCorruptions.class);
+ public static Set<ContainerTestCorruptions> getAllParamsExcept(
+ ContainerTestCorruptions... exclude) {
+ Set<ContainerTestCorruptions> includeSet =
+ EnumSet.allOf(ContainerTestCorruptions.class);
Arrays.asList(exclude).forEach(includeSet::remove);
return includeSet;
}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerReconciliationWithMockDatanodes.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerReconciliationWithMockDatanodes.java
index 6c52ecb1219..b694720436f 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerReconciliationWithMockDatanodes.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestContainerReconciliationWithMockDatanodes.java
@@ -709,7 +709,7 @@ public void introduceCorruption(long containerID, int numBlocksToRemove, int num
int size = blockDataList.size();
for (int i = 0; i < numBlocksToRemove; i++) {
BlockData blockData = reverse ? blockDataList.get(size - 1 - i) : blockDataList.get(i);
- File blockFile = TestContainerCorruptions.getBlock(container, blockData.getBlockID().getLocalID());
+ File blockFile = ContainerTestCorruptions.getBlock(container, blockData.getBlockID().getLocalID());
Assertions.assertTrue(blockFile.delete());
handle.getStore().getBlockDataTable().deleteWithBatch(batch,
containerData.getBlockKey(blockData.getLocalID()));
@@ -728,7 +728,7 @@ public void introduceCorruption(long containerID, int numBlocksToRemove, int num
int blockIndex = reverse ? size - 1 - (i % size) : i % size;
BlockData blockData = blockDataList.get(blockIndex);
int chunkIndex = i / size;
- File blockFile = TestContainerCorruptions.getBlock(container, blockData.getBlockID().getLocalID());
+ File blockFile = ContainerTestCorruptions.getBlock(container, blockData.getBlockID().getLocalID());
List<ContainerProtos.ChunkInfo> chunks = new ArrayList<>(blockData.getChunks());
ContainerProtos.ChunkInfo chunkInfo = chunks.remove(chunkIndex);
corruptFileAtOffset(blockFile, chunkInfo.getOffset(), chunkInfo.getLen());
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
index 134770befc0..c0dff1dbeed 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
@@ -23,7 +23,7 @@
import static org.apache.hadoop.ozone.container.checksum.ContainerMerkleTreeTestUtils.buildTestTree;
import static org.apache.hadoop.ozone.container.checksum.ContainerMerkleTreeTestUtils.verifyAllDataChecksumsMatch;
import static org.apache.hadoop.ozone.container.common.statemachine.DatanodeConfiguration.CONTAINER_SCHEMA_V3_ENABLED;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_METADATA_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_METADATA_DIR;
import static org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerUtil.isSameSchemaVersion;
import static org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
index 25ae9aa6562..4f7d5e8b2da 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
@@ -17,15 +17,15 @@
package org.apache.hadoop.ozone.container.keyvalue;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.CORRUPT_BLOCK;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.CORRUPT_CONTAINER_FILE;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_BLOCK;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_CHUNKS_DIR;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_CONTAINER_DIR;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_CONTAINER_FILE;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_METADATA_DIR;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.TRUNCATED_BLOCK;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.TRUNCATED_CONTAINER_FILE;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.CORRUPT_BLOCK;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.CORRUPT_CONTAINER_FILE;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_BLOCK;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_CHUNKS_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_CONTAINER_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_CONTAINER_FILE;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_METADATA_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.TRUNCATED_BLOCK;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.TRUNCATED_CONTAINER_FILE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -87,7 +87,7 @@ private static Stream<ContainerTestVersionInfo> provideContainerVersions() {
* metadata fault.
*/
private static Stream<Arguments> provideMetadataCorruptions() {
- List<TestContainerCorruptions> metadataCorruptions = Arrays.asList(
+ List<ContainerTestCorruptions> metadataCorruptions = Arrays.asList(
MISSING_CHUNKS_DIR,
MISSING_METADATA_DIR,
MISSING_CONTAINER_DIR,
@@ -106,7 +106,7 @@ private static Stream<Arguments> provideMetadataCorruptions() {
@ParameterizedTest
@MethodSource("provideMetadataCorruptions")
public void testExitEarlyOnMetadataError(ContainerTestVersionInfo versionInfo,
- TestContainerCorruptions metadataCorruption) throws Exception {
+ ContainerTestCorruptions metadataCorruption) throws Exception {
initTestData(versionInfo);
long containerID = 101;
int deletedBlocks = 0;
diff --git a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestRawSstFileRecords.java b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/RawSstFileRecords.java
similarity index 98%
rename from hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestRawSstFileRecords.java
rename to hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/RawSstFileRecords.java
index cd2cdc3abf1..f9fd708a2ac 100644
--- a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestRawSstFileRecords.java
+++ b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/RawSstFileRecords.java
@@ -28,11 +28,11 @@
/**
* Test helper that reads all key versions from raw SST files.
*/
-final class TestRawSstFileRecords {
+final class RawSstFileRecords {
private static final int DEFAULT_READ_AHEAD_SIZE = 2 * 1024 * 1024;
- private TestRawSstFileRecords() {
+ private RawSstFileRecords() {
}
static List<SourceRecord> readFile(Path sstFile) throws IOException {
diff --git a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestLatestVersionedKWayMergeIteratorOverSst.java b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestLatestVersionedKWayMergeIteratorOverSst.java
index 3b7c9e4bed0..1d134e408bf 100644
--- a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestLatestVersionedKWayMergeIteratorOverSst.java
+++ b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/TestLatestVersionedKWayMergeIteratorOverSst.java
@@ -37,7 +37,7 @@
import java.util.stream.Stream;
import org.apache.hadoop.hdds.utils.NativeLibraryNotLoadedException;
import org.apache.hadoop.hdds.utils.db.LatestVersionedKWayMergeIterator.MergedKeyValue;
-import org.apache.hadoop.hdds.utils.db.TestRawSstFileRecords.SourceRecord;
+import org.apache.hadoop.hdds.utils.db.RawSstFileRecords.SourceRecord;
import org.apache.hadoop.hdds.utils.db.managed.ManagedColumnFamilyOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedDBOptions;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
@@ -111,7 +111,7 @@ void testWorkedExampleOverRealSstFiles() throws Exception {
}
}
- List<List<SourceRecord>> perSource = TestRawSstFileRecords.readFiles(sstFiles);
+ List<List<SourceRecord>> perSource = RawSstFileRecords.readFiles(sstFiles);
long k1VersionsAcrossFiles = perSource.stream()
.flatMap(List::stream)
.filter(record -> Arrays.equals(record.getUserKey(), keyBytes("k1")))
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 fcbc8a12ab7..b246c1086b2 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
@@ -109,10 +109,10 @@
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.DBHandle;
import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
+import org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueHandler;
-import org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import org.apache.hadoop.ozone.container.keyvalue.interfaces.BlockManager;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -461,7 +461,7 @@ public void testContainerChecksumChunkCorruption() throws Exception {
// 2. Corrupt every block in one replica.
for (BlockData blockData : blockDatas) {
long blockID = blockData.getLocalID();
- TestContainerCorruptions.CORRUPT_BLOCK.applyTo(container, blockID);
+ ContainerTestCorruptions.CORRUPT_BLOCK.applyTo(container, blockID);
}
datanodeStateMachine.getContainer().getContainerSet().scanContainerWithoutGap(containerID, TEST_SCAN);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
index bcfd013a7ad..2bd1bce4f79 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
@@ -32,8 +32,8 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerDataProto.State;
import org.apache.hadoop.hdds.scm.container.ContainerChecksums;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
+import org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
-import org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions;
import org.apache.hadoop.ozone.container.ozoneimpl.BackgroundContainerDataScanner;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerScannerConfiguration;
import org.apache.ozone.test.GenericTestUtils;
@@ -72,7 +72,7 @@ static void init() throws Exception {
@ParameterizedTest
// Background container data scanner should be able to detect all errors.
@EnumSource
- void testCorruptionDetected(TestContainerCorruptions corruption)
+ void testCorruptionDetected(ContainerTestCorruptions corruption)
throws Exception {
pauseScanner();
@@ -99,8 +99,8 @@ void testCorruptionDetected(TestContainerCorruptions corruption)
// Wait for SCM to get a report of the unhealthy replica with a different checksum than before.
waitForScmToSeeReplicaState(containerID, UNHEALTHY);
ContainerChecksums newReportedChecksum = getContainerReplica(containerID).getChecksums();
- if (corruption == TestContainerCorruptions.MISSING_METADATA_DIR ||
- corruption == TestContainerCorruptions.MISSING_CONTAINER_DIR) {
+ if (corruption == ContainerTestCorruptions.MISSING_METADATA_DIR ||
+ corruption == ContainerTestCorruptions.MISSING_CONTAINER_DIR) {
// In these cases, the new tree will not be able to be written since it exists in the metadata directory.
// When the tree write fails, the in-memory checksum should remain at its original value.
assertEquals(initialReportedChecksum, newReportedChecksum);
@@ -113,8 +113,8 @@ void testCorruptionDetected(TestContainerCorruptions corruption)
verifyAllDataChecksumsMatch(containerData, getConf());
}
- if (corruption == TestContainerCorruptions.TRUNCATED_BLOCK ||
- corruption == TestContainerCorruptions.CORRUPT_BLOCK) {
+ if (corruption == ContainerTestCorruptions.TRUNCATED_BLOCK ||
+ corruption == ContainerTestCorruptions.CORRUPT_BLOCK) {
// These errors will affect multiple chunks and result in multiple log messages.
corruption.assertLogged(containerID, getContainerLogCapturer());
} else {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
index a26093b8a3e..5e185af26b8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
@@ -20,8 +20,8 @@
import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.CLOSED;
import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.OPEN;
import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.UNHEALTHY;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_CONTAINER_DIR;
-import static org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions.MISSING_METADATA_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_CONTAINER_DIR;
+import static org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions.MISSING_METADATA_DIR;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,7 +34,7 @@
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.utils.ContainerLogger;
-import org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions;
+import org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions;
import org.apache.hadoop.ozone.container.ozoneimpl.BackgroundContainerMetadataScanner;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerScannerConfiguration;
import org.apache.ozone.test.GenericTestUtils;
@@ -53,11 +53,11 @@ class TestBackgroundContainerMetadataScannerIntegration
private final GenericTestUtils.LogCapturer logCapturer =
GenericTestUtils.LogCapturer.log4j2(ContainerLogger.LOG_NAME);
- static Collection<TestContainerCorruptions> supportedCorruptionTypes() {
- return TestContainerCorruptions.getAllParamsExcept(
- TestContainerCorruptions.MISSING_BLOCK,
- TestContainerCorruptions.CORRUPT_BLOCK,
- TestContainerCorruptions.TRUNCATED_BLOCK);
+ static Collection<ContainerTestCorruptions> supportedCorruptionTypes() {
+ return ContainerTestCorruptions.getAllParamsExcept(
+ ContainerTestCorruptions.MISSING_BLOCK,
+ ContainerTestCorruptions.CORRUPT_BLOCK,
+ ContainerTestCorruptions.TRUNCATED_BLOCK);
}
@BeforeAll
@@ -90,7 +90,7 @@ static void init() throws Exception {
*/
@ParameterizedTest
@MethodSource("supportedCorruptionTypes")
- void testCorruptionDetected(TestContainerCorruptions corruption)
+ void testCorruptionDetected(ContainerTestCorruptions corruption)
throws Exception {
// Write data to an open and closed container.
long closedContainerID = writeDataThenCloseContainer();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
index 14c0945ba9d..d28fb8b713a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
@@ -39,8 +39,8 @@
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.ContainerDispatcher;
import org.apache.hadoop.ozone.container.common.utils.ContainerLogger;
+import org.apache.hadoop.ozone.container.keyvalue.ContainerTestCorruptions;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
-import org.apache.hadoop.ozone.container.keyvalue.TestContainerCorruptions;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerScannerConfiguration;
import org.apache.hadoop.ozone.container.ozoneimpl.OnDemandContainerScanner;
import org.apache.hadoop.ozone.container.ozoneimpl.OnDemandScannerMetrics;
@@ -73,20 +73,20 @@ class TestOnDemandContainerScannerIntegration
- Block checksums are verified on the client side. If there is a checksum
error during read, the datanode will not learn about it.
*/
- static Collection<TestContainerCorruptions> supportedCorruptionTypes() {
- return TestContainerCorruptions.getAllParamsExcept(
- TestContainerCorruptions.MISSING_METADATA_DIR,
- TestContainerCorruptions.MISSING_CONTAINER_FILE,
- TestContainerCorruptions.CORRUPT_CONTAINER_FILE,
- TestContainerCorruptions.TRUNCATED_CONTAINER_FILE,
- TestContainerCorruptions.CORRUPT_BLOCK,
- TestContainerCorruptions.TRUNCATED_BLOCK);
+ static Collection<ContainerTestCorruptions> supportedCorruptionTypes() {
+ return ContainerTestCorruptions.getAllParamsExcept(
+ ContainerTestCorruptions.MISSING_METADATA_DIR,
+ ContainerTestCorruptions.MISSING_CONTAINER_FILE,
+ ContainerTestCorruptions.CORRUPT_CONTAINER_FILE,
+ ContainerTestCorruptions.TRUNCATED_CONTAINER_FILE,
+ ContainerTestCorruptions.CORRUPT_BLOCK,
+ ContainerTestCorruptions.TRUNCATED_BLOCK);
}
- static Collection<TestContainerCorruptions> supportedCorruptionTypesForOpen() {
- Set<TestContainerCorruptions> set = EnumSet.copyOf(supportedCorruptionTypes());
+ static Collection<ContainerTestCorruptions> supportedCorruptionTypesForOpen() {
+ Set<ContainerTestCorruptions> set = EnumSet.copyOf(supportedCorruptionTypes());
// Open containers will be checked only for metadata corruption, so missing block is not a valid corruption type.
- set.remove(TestContainerCorruptions.MISSING_BLOCK);
+ set.remove(ContainerTestCorruptions.MISSING_BLOCK);
return set;
}
@@ -113,7 +113,7 @@ static void init() throws Exception {
*/
@ParameterizedTest
@MethodSource("supportedCorruptionTypes")
- void testCorruptionDetected(TestContainerCorruptions corruption)
+ void testCorruptionDetected(ContainerTestCorruptions corruption)
throws Exception {
String keyName = "testKey";
long containerID = writeDataThenCloseContainer(keyName);
@@ -141,8 +141,8 @@ void testCorruptionDetected(TestContainerCorruptions corruption)
corruption.assertLogged(containerID, 1, logCapturer);
long newReportedDataChecksum = getContainerReplica(containerID).getDataChecksum();
- if (corruption == TestContainerCorruptions.MISSING_METADATA_DIR ||
- corruption == TestContainerCorruptions.MISSING_CONTAINER_DIR) {
+ if (corruption == ContainerTestCorruptions.MISSING_METADATA_DIR ||
+ corruption == ContainerTestCorruptions.MISSING_CONTAINER_DIR) {
// In these cases, the new tree will not be able to be written since it exists in the metadata directory.
// When the tree write fails, the in-memory checksum should remain at its original value.
assertEquals(initialReportedDataChecksum, newReportedDataChecksum);
@@ -164,7 +164,7 @@ void testCorruptionDetected(TestContainerCorruptions corruption)
*/
@ParameterizedTest
@MethodSource("supportedCorruptionTypesForOpen")
- void testCorruptionDetectedForOpenContainers(TestContainerCorruptions corruption)
+ void testCorruptionDetectedForOpenContainers(ContainerTestCorruptions corruption)
throws Exception {
String keyName = "keyName";
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleConfigurationRequestTestBase.java
similarity index 99%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationRequest.java
rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleConfigurationRequestTestBase.java
index 69541c393c3..3658c97832c 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleConfigurationRequestTestBase.java
@@ -58,7 +58,7 @@
* Base test class for Lifecycle configuration request.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMLifecycleConfigurationRequest {
+class OMLifecycleConfigurationRequestTestBase {
@TempDir
private File tempDir;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationDeleteRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationDeleteRequest.java
index ed7a9e146a0..12d31eb2bda 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationDeleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationDeleteRequest.java
@@ -57,7 +57,7 @@
* Test class for delete Lifecycle configuration request.
*/
public class TestOMLifecycleConfigurationDeleteRequest extends
- TestOMLifecycleConfigurationRequest {
+ OMLifecycleConfigurationRequestTestBase {
@Test
public void testPreExecute() throws Exception {
OMRequest omRequest = createDeleteLifecycleConfigurationRequest(
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationSetRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationSetRequest.java
index 4029c6c36ba..12b918c32d8 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationSetRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationSetRequest.java
@@ -62,7 +62,7 @@
* Test class for create Lifecycle configuration request.
*/
public class TestOMLifecycleConfigurationSetRequest extends
- TestOMLifecycleConfigurationRequest {
+ OMLifecycleConfigurationRequestTestBase {
@Test
public void testPreExecute() throws Exception {
String volumeName = UUID.randomUUID().toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org