diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java index 34ba542b1ded..58bd67311dce 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestNSSummaryMemoryLeak.java @@ -35,9 +35,9 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -149,7 +149,7 @@ public static void init() throws Exception { client = cluster.newClient(); // Create FSO bucket for testing - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); String volumeName = bucket.getVolumeName(); String bucketName = bucket.getName(); 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 19af93bd7bc7..3d3bd862bc11 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 @@ -67,9 +67,9 @@ import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.container.TestHelper; @@ -177,7 +177,7 @@ static void init() throws Exception { String volumeName = "vol1"; String bucketName = "bucket1"; - ozoneBucket = TestDataUtil.createVolumeAndBucket( + ozoneBucket = DataTestUtil.createVolumeAndBucket( client, volumeName, bucketName, BucketLayout.FILE_SYSTEM_OPTIMIZED); String keyNameR3 = "key1"; @@ -432,7 +432,7 @@ private static OmKeyInfo createTestKey(String keyName, ReplicationConfig replicationConfig) throws IOException { byte[] textBytes = "Testing".getBytes(UTF_8); - TestDataUtil.createKey(ozoneBucket, keyName, replicationConfig, textBytes); + DataTestUtil.createKey(ozoneBucket, keyName, replicationConfig, textBytes); OmKeyArgs keyArgs = new OmKeyArgs.Builder() .setVolumeName(ozoneBucket.getVolumeName()) diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java index d7a2dea67e10..fc83693788ee 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java @@ -50,9 +50,9 @@ import org.apache.hadoop.hdds.scm.server.OzoneStorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.OMMetadataManager; @@ -159,7 +159,7 @@ public void cleanup() throws IOException { @MethodSource("replicationConfigs") public void testGetDeletedDirectoryInfo(ReplicationConfig replicationConfig) throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, new DefaultReplicationConfig(replicationConfig)); String rootPath = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucket.getName(), bucket.getVolumeName()); @@ -283,7 +283,7 @@ public void testGetDeletedDirectoryInfo(ReplicationConfig replicationConfig) @MethodSource("replicationConfigs") public void testGetDeletedDirectoryInfoForNestedDirectories(ReplicationConfig replicationConfig) throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, new DefaultReplicationConfig(replicationConfig)); String rootPath = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucket.getName(), bucket.getVolumeName()); @@ -395,7 +395,7 @@ public void testGetDeletedDirectoryInfoForNestedDirectories(ReplicationConfig re @MethodSource("replicationConfigs") public void testGetDeletedDirectoryInfoWithMultipleSubdirectories(ReplicationConfig replicationConfig) throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED, new DefaultReplicationConfig(replicationConfig)); String rootPath = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucket.getName(), bucket.getVolumeName()); diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java index 51638133e961..bac55b7ef3c3 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java @@ -30,8 +30,8 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.server.OzoneStorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -92,7 +92,7 @@ private void writeKeys(String vol, String bucket, String key) String keyString = UUID.randomUUID().toString(); byte[] data = ContainerTestHelper.getFixedLengthString( keyString, 100).getBytes(UTF_8); - TestDataUtil.createKey(ozoneBucket, key, data); + DataTestUtil.createKey(ozoneBucket, key, data); } @Test diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java index 638bb93e813b..302c3772c266 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java @@ -92,10 +92,10 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.OzoneClientConfig; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -198,7 +198,7 @@ void init() throws Exception { writeClient = client.getObjectStore() .getClientProxy().getOzoneManagerClient(); // create a volume and a bucket to be used by OzoneFileSystem - ozoneBucket = TestDataUtil.createVolumeAndBucket(client, bucketLayout); + ozoneBucket = DataTestUtil.createVolumeAndBucket(client, bucketLayout); volumeName = ozoneBucket.getVolumeName(); bucketName = ozoneBucket.getName(); @@ -368,7 +368,7 @@ public void testMakeDirsWithAnFakeDirectory() throws Exception { String fakeGrandpaKey = "dir1"; String fakeParentKey = fakeGrandpaKey + "/dir2"; String fullKeyName = fakeParentKey + "/key1"; - TestDataUtil.createKey(ozoneBucket, fullKeyName, new byte[0]); + DataTestUtil.createKey(ozoneBucket, fullKeyName, new byte[0]); // /dir1/dir2 should not exist assertFalse(fs.exists(new Path(fakeParentKey))); @@ -416,10 +416,10 @@ void testContentSummaryErasureCodingPolicy() throws Exception { fs.mkdirs(parentDir); String ratisRelKey = "ec-policy-mixed-o3fs/" + ratisKey; String ecRelKey = "ec-policy-mixed-o3fs/" + ecKey; - TestDataUtil.createKey(ozoneBucket, ratisRelKey, + DataTestUtil.createKey(ozoneBucket, ratisRelKey, RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE), new byte[]{0}); - TestDataUtil.createKey(ozoneBucket, ecRelKey, ecConfig, + DataTestUtil.createKey(ozoneBucket, ecRelKey, ecConfig, new byte[]{0}); try { @@ -792,7 +792,7 @@ public void testListStatusOnKeyNameContainDelimiter() throws Exception { * the "/dir1", "/dir1/dir2/" are fake directory * */ String keyName = "dir1/dir2/key1"; - TestDataUtil.createKey(ozoneBucket, keyName, new byte[0]); + DataTestUtil.createKey(ozoneBucket, keyName, new byte[0]); FileStatus[] fileStatuses; fileStatuses = fs.listStatus(ROOT, EXCLUDE_TRASH); @@ -1119,7 +1119,7 @@ public void testRenameContainDelimiterFile() throws Exception { String fakeParentKey = fakeGrandpaKey + "/dir2"; String sourceKeyName = fakeParentKey + "/key1"; String targetKeyName = fakeParentKey + "/key2"; - TestDataUtil.createKey(ozoneBucket, sourceKeyName, new byte[0]); + DataTestUtil.createKey(ozoneBucket, sourceKeyName, new byte[0]); Path sourcePath = pathUnderFsRoot("/" + sourceKeyName); Path targetPath = pathUnderFsRoot("/" + targetKeyName); @@ -1246,7 +1246,7 @@ public void testGetTrashRoot() throws IOException { public void testCreateKeyShouldUseRefreshedBucketReplicationConfig() throws IOException { OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); final MockClock testClock = new MockClock(Instant.now(), ZoneOffset.UTC); String rootPath = String @@ -1552,7 +1552,7 @@ public void testProcessingDetails() throws IOException, InterruptedException { GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer.captureLogs(log); int keySize = 1024; - TestDataUtil.createKey(ozoneBucket, "key1", new byte[keySize]); + DataTestUtil.createKey(ozoneBucket, "key1", new byte[keySize]); logCapturer.stopCapturing(); String logContent = logCapturer.getOutput(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java index e479cbb661eb..a0d09264adbe 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java @@ -97,12 +97,12 @@ import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport; import org.apache.hadoop.mapreduce.Job; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OFSPath; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -196,7 +196,7 @@ void shutdown() { void createVolumeAndBucket() throws IOException { // create a volume and a bucket to be used by RootedOzoneFileSystem (OFS) OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); volumeName = bucket.getVolumeName(); volumePath = new Path(OZONE_URI_DELIMITER, volumeName); bucketName = bucket.getName(); @@ -304,7 +304,7 @@ void testListStatusWithIntermediateDirWithECEnabled() String key = "object-dir/object-name1"; // write some test data into bucket - TestDataUtil.createKey(objectStore.getVolume(volumeName).getBucket(bucketName), + DataTestUtil.createKey(objectStore.getVolume(volumeName).getBucket(bucketName), key, new ECReplicationConfig("RS-3-2-1024k"), RandomUtils.secure().randomBytes(1)); @@ -1251,7 +1251,7 @@ void testSymlinkList() throws Exception { // add key in source bucket final String key = "object-dir/object-name1"; - TestDataUtil.createKey(objectStore.getVolume(srcVolume).getBucket(srcBucket), + DataTestUtil.createKey(objectStore.getVolume(srcVolume).getBucket(srcBucket), key, RandomUtils.secure().randomBytes(1)); assertEquals(key, objectStore.getVolume(srcVolume) .getBucket(srcBucket).getKey(key).getName()); @@ -1299,7 +1299,7 @@ void testSymlinkPosixDelete() throws Exception { // add key to srcBucket final String key = "object-dir/object-name1"; - TestDataUtil.createKey(objectStore.getVolume(srcVolume).getBucket(srcBucket), + DataTestUtil.createKey(objectStore.getVolume(srcVolume).getBucket(srcBucket), key, RandomUtils.secure().randomBytes(1)); assertEquals(key, objectStore.getVolume(srcVolume). getBucket(srcBucket).getKey(key).getName()); @@ -1535,7 +1535,7 @@ void testGetTrashRoots() throws IOException { // Create a new volume and a new bucket OzoneBucket bucket3 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); OzoneVolume volume3 = objectStore.getVolume(bucket3.getVolumeName()); // Need to setOwner to current test user so it has permission to list vols volume3.setOwner(username); @@ -1596,7 +1596,7 @@ void testTrash() throws Exception { } // create second bucket and write a key in it. OzoneBucket bucket2 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); String volumeName2 = bucket2.getVolumeName(); Path volumePath2 = new Path(OZONE_URI_DELIMITER, volumeName2); String bucketName2 = bucket2.getName(); @@ -1790,7 +1790,7 @@ void testBucketDefaultsShouldNotBeInheritedToFileForNonEC() BucketArgs omBucketArgs = builder.build(); String vol = UUID.randomUUID().toString(); String buck = UUID.randomUUID().toString(); - final OzoneBucket bucket100 = TestDataUtil + final OzoneBucket bucket100 = DataTestUtil .createVolumeAndBucket(client, vol, buck, omBucketArgs); assertEquals(ReplicationType.STAND_ALONE.name(), bucket100.getReplicationConfig().getReplicationType().name()); @@ -1819,7 +1819,7 @@ void testBucketDefaultsShouldBeInheritedToFileForEC() BucketArgs omBucketArgs = builder.build(); String vol = UUID.randomUUID().toString(); String buck = UUID.randomUUID().toString(); - final OzoneBucket bucket101 = TestDataUtil + final OzoneBucket bucket101 = DataTestUtil .createVolumeAndBucket(client, vol, buck, omBucketArgs); assertEquals(ReplicationType.EC.name(), bucket101.getReplicationConfig().getReplicationType().name()); @@ -1869,7 +1869,7 @@ void testCreateAndCheckECFileDiskUsage() throws Exception { Path bucketPathTest = new Path(volPathTest, bucketName); // write some test data into bucket - TestDataUtil.createKey(objectStore.getVolume(volumeName). + DataTestUtil.createKey(objectStore.getVolume(volumeName). getBucket(bucketName), key, new ECReplicationConfig("RS-3-2-1024k"), RandomUtils.secure().randomBytes(1)); // make sure the disk usage matches the expected value @@ -1897,10 +1897,10 @@ void testContentSummaryErasureCodingPolicy() throws Exception { OzoneBucket bucket = objectStore.getVolume(volumeName).getBucket(bucketName); String ratisRelKey = "ec-policy-mixed/" + ratisKey; String ecRelKey = "ec-policy-mixed/" + ecKey; - TestDataUtil.createKey(bucket, ratisRelKey, + DataTestUtil.createKey(bucket, ratisRelKey, RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE), new byte[]{0}); - TestDataUtil.createKey(bucket, ecRelKey, ecConfig, + DataTestUtil.createKey(bucket, ecRelKey, ecConfig, new byte[]{0}); try { @@ -1942,7 +1942,7 @@ void testCreateAndCheckRatisFileDiskUsage() throws Exception { Path filePathTest = new Path(bucketPathTest, key); // write some test data into bucket - TestDataUtil.createKey(objectStore. + DataTestUtil.createKey(objectStore. getVolume(volumeName).getBucket(bucketName), key, RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE), RandomUtils.secure().randomBytes(1)); @@ -2019,7 +2019,7 @@ private Path createAndGetBucketPath() String vol = UUID.randomUUID().toString(); String buck = UUID.randomUUID().toString(); final OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, vol, buck, omBucketArgs); + DataTestUtil.createVolumeAndBucket(client, vol, buck, omBucketArgs); Path volume = new Path(OZONE_URI_DELIMITER, bucket.getVolumeName()); return new Path(volume, bucket.getName()); } @@ -2028,7 +2028,7 @@ private Path createAndGetBucketPath() void testSnapshotRead() throws Exception { // Init data OzoneBucket bucket1 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); Path volume1Path = new Path(OZONE_URI_DELIMITER, bucket1.getVolumeName()); Path bucket1Path = new Path(volume1Path, bucket1.getName()); Path file1 = new Path(bucket1Path, "key1"); @@ -2038,7 +2038,7 @@ void testSnapshotRead() throws Exception { ContractTestUtils.touch(fs, file2); OzoneBucket bucket2 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); Path volume2Path = new Path(OZONE_URI_DELIMITER, bucket2.getVolumeName()); Path bucket2Path = new Path(volume2Path, bucket2.getName()); @@ -2071,7 +2071,7 @@ void testFileSystemDeclaresCapability() throws Throwable { @Test void testSnapshotDiff() throws Exception { OzoneBucket bucket1 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); Path volumePath1 = new Path(OZONE_URI_DELIMITER, bucket1.getVolumeName()); Path bucketPath1 = new Path(volumePath1, bucket1.getName()); Path snap1 = fs.createSnapshot(bucketPath1); @@ -2133,7 +2133,7 @@ void testSnapshotDiff() throws Exception { @Test void testSetTimes() throws Exception { OzoneBucket bucket1 = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); Path volumePath1 = new Path(OZONE_URI_DELIMITER, bucket1.getVolumeName()); Path bucketPath1 = new Path(volumePath1, bucket1.getName()); setTimes(bucketPath1); @@ -2143,7 +2143,7 @@ void testSetTimes() throws Exception { public void testSetTimesForLinkedBucketPath() throws Exception { // Create a file OzoneBucket sourceBucket = - TestDataUtil.createVolumeAndBucket(client, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, bucketLayout); Path volumePath1 = new Path(OZONE_URI_DELIMITER, sourceBucket.getVolumeName()); Path sourceBucketPath = new Path(volumePath1, sourceBucket.getName()); 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 ec5887fff0e6..bb240bbc5970 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 @@ -19,6 +19,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_RATIS_PIPELINE_LIMIT; +import static org.apache.hadoop.ozone.DataTestUtil.cleanupDeletedTable; +import static org.apache.hadoop.ozone.DataTestUtil.cleanupOpenKeyTable; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_DATASTREAM_AUTO_THRESHOLD; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_DATASTREAM_ENABLED; @@ -26,8 +28,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.OZONE_ROOT; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME; -import static org.apache.hadoop.ozone.TestDataUtil.cleanupDeletedTable; -import static org.apache.hadoop.ozone.TestDataUtil.cleanupOpenKeyTable; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY; @@ -93,11 +93,11 @@ import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -208,7 +208,7 @@ public static void init() throws Exception { client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - bucket = TestDataUtil.createVolumeAndBucket(client, layout); + bucket = DataTestUtil.createVolumeAndBucket(client, layout); openKeyCleanupService = (OpenKeyCleanupService) cluster.getOzoneManager().getKeyManager().getOpenKeyCleanupService(); @@ -1077,7 +1077,7 @@ public void testECStreamCapability() throws Exception { 3, 2, ECReplicationConfig.EcCodec.RS, (int) OzoneConsts.MB))); BucketArgs omBucketArgs = builder.build(); String ecBucket = UUID.randomUUID().toString(); - TestDataUtil.createBucket(client, bucket.getVolumeName(), omBucketArgs, + DataTestUtil.createBucket(client, bucket.getVolumeName(), omBucketArgs, ecBucket); String ecUri = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, ecBucket, bucket.getVolumeName()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java index 0c4f9c97b7bc..aca8b240cc60 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java @@ -51,9 +51,9 @@ import org.apache.hadoop.hdds.scm.storage.BufferPool; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.container.keyvalue.KeyValueHandler; @@ -136,7 +136,7 @@ public void init() throws Exception { client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - bucket = TestDataUtil.createVolumeAndBucket(client, layout); + bucket = DataTestUtil.createVolumeAndBucket(client, layout); // Enable DEBUG level logging for relevant classes GenericTestUtils.setLogLevel(BlockManagerImpl.class, Level.DEBUG); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java index 061ced5bd93f..eda35dca66b5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java @@ -59,10 +59,10 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.container.keyvalue.KeyValueHandler; @@ -159,7 +159,7 @@ public void init() throws IOException, InterruptedException, client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, layout); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, layout); GenericTestUtils.setLogLevel(XceiverClientGrpc.class, Level.DEBUG); @@ -260,7 +260,7 @@ public void testRecoveryWithoutHsyncHflushOnLastBlock() throws Exception { @Test public void testOBSRecoveryShouldFail() throws Exception { - OzoneBucket obsBucket = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket obsBucket = DataTestUtil.createVolumeAndBucket(client, "vol2", "obs", BucketLayout.OBJECT_STORE); String obsDir = OZONE_ROOT + obsBucket.getVolumeName() + OZONE_URI_DELIMITER + obsBucket.getName(); Path obsFile = new Path(obsDir, uniqueObjectName()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSBucketLayout.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSBucketLayout.java index 033020310c6d..86f602b53643 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSBucketLayout.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSBucketLayout.java @@ -34,8 +34,8 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.OzoneClientConfig; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -97,7 +97,7 @@ void setUp() throws Exception { objectStore = client.getObjectStore(); rootPath = String.format("%s://%s/", OzoneConsts.OZONE_OFS_URI_SCHEME, cluster().getConf().get(OZONE_OM_ADDRESS_KEY)); - volumeName = TestDataUtil.createVolumeAndBucket(client).getVolumeName(); + volumeName = DataTestUtil.createVolumeAndBucket(client).getVolumeName(); } @AfterAll diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java index e039e14e47d0..cc2f19da2a6c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSInputStream.java @@ -43,8 +43,8 @@ import org.apache.hadoop.hdds.protocol.StorageType; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.SequenceFile; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -74,7 +74,7 @@ void init() throws Exception { client = cluster().newClient(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); // Set the fs.defaultFS and start the filesystem String uri = String.format("%s://%s.%s/", @@ -97,7 +97,7 @@ void init() throws Exception { (int) OzoneConsts.MB))); BucketArgs omBucketArgs = builder.build(); String ecBucket = UUID.randomUUID().toString(); - TestDataUtil.createBucket(client, bucket.getVolumeName(), omBucketArgs, + DataTestUtil.createBucket(client, bucket.getVolumeName(), omBucketArgs, ecBucket); String ecUri = String.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, ecBucket, bucket.getVolumeName()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java index 012c7a600722..1bd4b1b28af2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java @@ -49,8 +49,8 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OmUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKey; @@ -104,7 +104,7 @@ public void init() throws Exception { bucketName = RandomStringUtils.secure().nextAlphabetic(10).toLowerCase(); // create a volume and a bucket to be used by OzoneFileSystem - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.LEGACY); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.LEGACY); String rootPath = String.format("%s://%s.%s/", OZONE_URI_SCHEME, bucketName, volumeName); @@ -402,7 +402,7 @@ public void testDoubleSlashPrefixPathNormalization(int slashCount) throws Except ArrayList expectedKeys = new ArrayList<>(); expectedKeys.add(dirPath); expectedKeys.add(normalizedKey); - TestDataUtil.createKey(ozoneBucket, slashyKey, data); + DataTestUtil.createKey(ozoneBucket, slashyKey, data); try { ozoneBucket.readKey(slashyKey).close(); @@ -430,7 +430,7 @@ private void checkKeyList(Iterator ozoneKeyIterator, private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length) throws Exception { - byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length); + byte[] input = DataTestUtil.createStringKey(ozoneBucket, key, length); // Read the key with given key name. readKey(ozoneBucket, key, length, input); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileChecksum.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileChecksum.java index 20bc7bb44e78..45a855335e0d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileChecksum.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileChecksum.java @@ -19,9 +19,9 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_KEY; +import static org.apache.hadoop.ozone.DataTestUtil.createBucket; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE; -import static org.apache.hadoop.ozone.TestDataUtil.createBucket; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.arguments; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java index b57e298b7bee..8a4e824285d7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMetrics.java @@ -28,8 +28,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.io.OzoneOutputStream; @@ -70,7 +70,7 @@ void init() throws Exception { omConfig.setFileSystemPathEnabled(true); // create a volume and a bucket to be used by OzoneFileSystem - bucket = TestDataUtil.createVolumeAndBucket(client, BucketLayout.LEGACY); + bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.LEGACY); // Set the fs.defaultFS and start the filesystem String uri = String.format("%s://%s.%s/", diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMissingParent.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMissingParent.java index fc79197202f1..1bea1f1ed1d9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMissingParent.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemMissingParent.java @@ -27,8 +27,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.exceptions.OMException; @@ -54,7 +54,7 @@ public abstract class TestOzoneFileSystemMissingParent implements NonHATests.Tes void init() throws Exception { client = cluster().newClient(); - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); String volumeName = bucket.getVolumeName(); Path volumePath = new Path(OZONE_URI_DELIMITER, volumeName); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java index facea4409650..7401e4b9f902 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java @@ -27,9 +27,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.debug.om.PrefixParser; import org.apache.hadoop.ozone.om.OMStorage; @@ -70,7 +70,7 @@ public static void init() throws Exception { // create a volume and a bucket to be used by OzoneFileSystem try (OzoneClient client = cluster.newClient()) { - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.FILE_SYSTEM_OPTIMIZED); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java index c141f3fb37fa..f85247d687e1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java @@ -44,8 +44,8 @@ import org.apache.hadoop.hdds.conf.StorageUnit; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.io.SelectorOutputStream; @@ -101,7 +101,7 @@ public static void init() throws Exception { client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - bucket = TestDataUtil.createVolumeAndBucket(client, layout); + bucket = DataTestUtil.createVolumeAndBucket(client, layout); } @AfterAll diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreamingDisabledDatanode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreamingDisabledDatanode.java index cb59a3ae4da1..8019e3f63eb5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreamingDisabledDatanode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreamingDisabledDatanode.java @@ -35,8 +35,8 @@ import org.apache.hadoop.hdds.conf.StorageUnit; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -85,7 +85,7 @@ public static void init() throws Exception { cluster.waitForClusterToBeReady(); client = cluster.newClient(); - bucket = TestDataUtil.createVolumeAndBucket(client, layout); + bucket = DataTestUtil.createVolumeAndBucket(client, layout); } @AfterAll diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java index 87ad01b595c5..b15bf148e6fa 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java @@ -21,9 +21,9 @@ import java.io.IOException; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -51,7 +51,7 @@ public Path getTestPath() { protected String getRootURI() throws IOException { try (OzoneClient client = getCluster().newClient()) { BucketLayout layout = getConf().getEnum(OZONE_DEFAULT_BUCKET_LAYOUT, BucketLayout.DEFAULT); - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, layout); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, layout); return String.format("%s://%s.%s/", getScheme(), bucket.getName(), bucket.getVolumeName()); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCloseContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCloseContainer.java index 7cbe2cc65bba..a3383a7a26d7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCloseContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCloseContainer.java @@ -50,10 +50,10 @@ import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager.ReplicationManagerConfiguration; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.container.checksum.ContainerMerkleTreeTestUtils; @@ -106,7 +106,7 @@ public void setUp() throws Exception { cluster.waitForClusterToBeReady(); client = cluster.newClient(); - bucket = TestDataUtil.createVolumeAndBucket(client, volName, bucketName); + bucket = DataTestUtil.createVolumeAndBucket(client, volName, bucketName); } @AfterEach @@ -122,7 +122,7 @@ public void testReplicasAreReportedForClosedContainerAfterRestart() throws Exception { // Create some keys to write data into the open containers for (int i = 0; i < 10; i++) { - TestDataUtil.createKey(bucket, "key" + i, "this is the content".getBytes(UTF_8)); + DataTestUtil.createKey(bucket, "key" + i, "this is the content".getBytes(UTF_8)); } StorageContainerManager scm = cluster.getStorageContainerManager(); @@ -180,7 +180,7 @@ public void testCloseClosedContainer() throws Exception { // Create some keys to write data into the open containers for (int i = 0; i < 10; i++) { - TestDataUtil.createKey(bucket, "key" + i, "this is the content".getBytes(UTF_8)); + DataTestUtil.createKey(bucket, "key" + i, "this is the content".getBytes(UTF_8)); } StorageContainerManager scm = cluster.getStorageContainerManager(); // Pick any container on the cluster and close it via client @@ -213,7 +213,7 @@ public void testCloseClosedContainer() public void testContainerChecksumForClosedContainer() throws Exception { // Create some keys to write data into the open containers ReplicationConfig repConfig = RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE); - TestDataUtil.createKey(bucket, "key1", repConfig, "this is the content".getBytes(UTF_8)); + DataTestUtil.createKey(bucket, "key1", repConfig, "this is the content".getBytes(UTF_8)); StorageContainerManager scm = cluster.getStorageContainerManager(); ContainerInfo containerInfo1 = scm.getContainerManager().getContainers().get(0); @@ -243,7 +243,7 @@ public void testContainerChecksumForClosedContainer() throws Exception { } // Create 2nd container and check the checksum doesn't match with 1st container - TestDataUtil.createKey(bucket, "key2", repConfig, "this is the different content".getBytes(UTF_8)); + DataTestUtil.createKey(bucket, "key2", repConfig, "this is the different content".getBytes(UTF_8)); ContainerInfo containerInfo2 = scm.getContainerManager().getContainers().get(1); for (HddsDatanodeService hddsDatanode : hddsDatanodes) { assertFalse(containerChecksumFileExists(hddsDatanode, containerInfo2.getContainerID())); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMFollowerCatchupWithContainerReport.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMFollowerCatchupWithContainerReport.java index 1e172d7be5cc..8ab1f6ae8ed6 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMFollowerCatchupWithContainerReport.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMFollowerCatchupWithContainerReport.java @@ -34,9 +34,9 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; import org.apache.hadoop.hdds.scm.container.ContainerID; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -280,7 +280,7 @@ private Set createKeys(String volumeName, String bucketName, byte[] keyDat for (int i = 0; i < NUM_KEYS; i++) { String keyName = "key-" + i; - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, RatisReplicationConfig.getInstance(THREE), keyData); OzoneKeyDetails keyDetails = bucket.getKey(keyName); keyDetails.getOzoneKeyLocations() diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java index 16515710160f..b21857bb2771 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java @@ -115,12 +115,12 @@ import org.apache.hadoop.net.DNSToSwitchMapping; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.net.StaticMapping; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.common.DeletedBlock; import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.hadoop.ozone.container.common.helpers.BlockData; @@ -265,7 +265,7 @@ private void testBlockDeletionTransactions(MiniOzoneCluster cluster) throws Exce .getScmBlockManager().getDeletedBlockLog(); assertEquals(0, delLog.getNumOfValidTransactions()); - Map keyLocations = TestDataUtil.createKeys(cluster, KEY_COUNT); + Map keyLocations = DataTestUtil.createKeys(cluster, KEY_COUNT); // Wait for container report Thread.sleep(1000); for (OmKeyInfo keyInfo : keyLocations.values()) { @@ -438,7 +438,7 @@ public void testBlockDeletingThrottling() throws Exception { .getScmBlockManager().getSCMBlockDeletingService(); delService.setBlockDeleteTXNum(limitSize); - Map keyLocations = TestDataUtil.createKeys(cluster, numKeys); + Map keyLocations = DataTestUtil.createKeys(cluster, numKeys); // Wait for container report Thread.sleep(5000); for (OmKeyInfo keyInfo : keyLocations.values()) { @@ -674,7 +674,7 @@ public void testCloseContainerCommandOnRestart() throws Exception { cluster.waitForClusterToBeReady(); cluster.waitForPipelineTobeReady(HddsProtos.ReplicationFactor.ONE, 30000); - TestDataUtil.createKeys(cluster, 10); + DataTestUtil.createKeys(cluster, 10); GenericTestUtils.waitFor(() -> cluster.getStorageContainerManager().getContainerManager() .getContainers() != null, 1000, 10000); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHAWithAllRunning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHAWithAllRunning.java index 9a3722c25281..c3bba5216e76 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHAWithAllRunning.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHAWithAllRunning.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hdds.scm.ha.SCMHAMetrics; import org.apache.hadoop.hdds.scm.ha.SCMRatisServerImpl; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -126,7 +126,7 @@ private void doPutKey() throws Exception { byte[] bytes = value.getBytes(UTF_8); RatisReplicationConfig replication = RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE); - TestDataUtil.createKey(bucket, keyName, replication, bytes); + DataTestUtil.createKey(bucket, keyName, replication, bytes); OzoneKey key = bucket.getKey(keyName); assertEquals(keyName, key.getName()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java index 13d6bf49fa0e..657e5d0cd4b0 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java @@ -30,8 +30,8 @@ import org.apache.hadoop.hdds.scm.node.SCMNodeManager; import org.apache.hadoop.hdds.scm.node.SCMNodeMetrics; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.io.OzoneOutputStream; @@ -82,7 +82,7 @@ public void setup() throws Exception { client = cluster.newClient(); // Create bucket for testing - bucket = TestDataUtil.createVolumeAndBucket(client); + bucket = DataTestUtil.createVolumeAndBucket(client); SCMNodeManager nodeManager = (SCMNodeManager) scm.getScmNodeManager(); assertNotNull(nodeManager); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java index 71d8e39338a1..1391e5847665 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/metrics/TestSCMContainerManagerMetrics.java @@ -35,9 +35,9 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.metrics2.MetricsRecordBuilder; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.NonHATests; @@ -137,7 +137,7 @@ public void testReportProcessingMetrics() throws Exception { OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm); // Create key should create container on DN. - TestDataUtil.createKeys(cluster(), 1); + DataTestUtil.createKeys(cluster(), 1); GenericTestUtils.waitFor(() -> { final MetricsRecordBuilder scmMetrics = 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 a1855fe9a757..65ce765ca600 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 @@ -70,9 +70,9 @@ import org.apache.hadoop.hdds.scm.node.NodeManager; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKeyDetails; @@ -157,7 +157,7 @@ void init() throws Exception { client = cluster.newClient(); scmClient = new ContainerOperationClient(cluster.getConf()); - bucket = TestDataUtil.createVolumeAndBucket(client); + bucket = DataTestUtil.createVolumeAndBucket(client); } @AfterEach @@ -178,7 +178,7 @@ void testReplicationManagerNotify() throws Exception { public void testClosedContainerReplicationWhenNodeDies() throws Exception { String keyName = "key-" + UUID.randomUUID(); - TestDataUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, + DataTestUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, "this is the content".getBytes(StandardCharsets.UTF_8)); // Get the container ID for the key @@ -226,7 +226,7 @@ void testClosedContainerReplicationWhenNodeDecommissionAndBackToInService( throws Exception { String keyName = "key-" + UUID.randomUUID(); - TestDataUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, + DataTestUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, "this is the content".getBytes(StandardCharsets.UTF_8)); OzoneKeyDetails key = bucket.getKey(keyName); @@ -277,7 +277,7 @@ void testClosedContainerReplicationWhenNodeDecommissionAndBackToInService( @Test public void testDeadMaintenanceNodeAndDecommission() throws Exception { String keyName = "key-" + UUID.randomUUID(); - TestDataUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, + DataTestUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, "this is the content".getBytes(StandardCharsets.UTF_8)); OzoneKeyDetails key = bucket.getKey(keyName); @@ -321,7 +321,7 @@ public void testDeadMaintenanceNodeAndDecommission() throws Exception { @Test public void testOneDeadMaintenanceNodeAndOneLiveMaintenanceNodeAndOneDecommissionNode() throws Exception { String keyName = "key-" + UUID.randomUUID(); - TestDataUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, + DataTestUtil.createKey(bucket, keyName, RATIS_REPLICATION_CONFIG, "this is the content".getBytes(StandardCharsets.UTF_8)); OzoneKeyDetails key = bucket.getKey(keyName); 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 7ccc131f53f7..5260c973ba06 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 @@ -73,10 +73,10 @@ import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneClusterProvider; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.ozone.test.GenericTestUtils; @@ -165,7 +165,7 @@ public void setUp() throws Exception { cluster = clusterProvider.provide(); setManagers(); client = cluster.newClient(); - bucket = TestDataUtil.createVolumeAndBucket(client, volName, bucketName); + bucket = DataTestUtil.createVolumeAndBucket(client, volName, bucketName); scmClient = new ContainerOperationClient(cluster.getConf()); } @@ -831,7 +831,7 @@ private void setManagers() { private void generateData(int keyCount, String keyPrefix, ReplicationConfig replicationConfig) throws IOException { for (int i = 0; i < keyCount; i++) { - TestDataUtil.createKey(bucket, keyPrefix + i, replicationConfig, + DataTestUtil.createKey(bucket, keyPrefix + i, replicationConfig, "this is the content".getBytes(StandardCharsets.UTF_8)); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java index 4a74d94a67b6..ef3c1e22e499 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java @@ -45,9 +45,9 @@ import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.ozone.test.GenericTestUtils; @@ -186,11 +186,11 @@ void testSafeModeExitAfterScmRestartWithMixedEcAndRatisThreeKeys() waitForRatis3NodePipelines(1); try (OzoneClient client = cluster.newClient()) { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); - TestDataUtil.createKey(bucket, "ec-key", + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); + DataTestUtil.createKey(bucket, "ec-key", new ECReplicationConfig("rs-3-2-1024k"), "ec-data".getBytes(UTF_8)); - TestDataUtil.createKey(bucket, "ratis3-key", + DataTestUtil.createKey(bucket, "ratis3-key", RatisReplicationConfig.getInstance(ReplicationFactor.THREE), "ratis-data".getBytes(UTF_8)); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java index 6f85c0969805..84da96ed422d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java @@ -26,9 +26,9 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.ha.SCMStateMachine; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -118,7 +118,7 @@ private void createTestData(OzoneClient client) throws IOException { OzoneBucket bucket = volume.getBucket("testbucket"); - TestDataUtil.createKey(bucket, "testkey123", + DataTestUtil.createKey(bucket, "testkey123", RatisReplicationConfig.getInstance(THREE), "Hello".getBytes(UTF_8)); } } 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 3fb1bc121af2..f61c22a61902 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 @@ -67,9 +67,9 @@ import org.apache.hadoop.hdds.utils.db.CodecException; import org.apache.hadoop.hdds.utils.db.RocksDatabaseException; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.UniformDatanodesFactory; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; @@ -335,7 +335,7 @@ public void testFinalizationNonEmptyClusterDataDistribution() throws Exception { final String keyName = "key" + System.nanoTime(); // Create the key String value = "sample value"; - TestDataUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); // update scmInfo in OM OzoneKeyDetails keyDetails = bucket.getKey(keyName); // delete the key diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/DataTestUtil.java similarity index 98% rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/DataTestUtil.java index dc0735c8f2eb..b1d10d99b321 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/DataTestUtil.java @@ -54,11 +54,11 @@ import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; /** - * Utility to help to generate test data. + * Utility class with helper methods for creating and managing test data in integration tests. */ -public final class TestDataUtil { +public final class DataTestUtil { - private TestDataUtil() { + private DataTestUtil() { } public static OzoneBucket createVolumeAndBucket(OzoneClient client, diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/admin/om/lease/TestLeaseRecoverer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/admin/om/lease/TestLeaseRecoverer.java index a93add3e9cc0..71e8eb6c1793 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/admin/om/lease/TestLeaseRecoverer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/admin/om/lease/TestLeaseRecoverer.java @@ -35,7 +35,7 @@ import org.apache.hadoop.fs.LeaseRecoverable; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdds.utils.IOUtils; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -59,7 +59,7 @@ void init() throws Exception { client = cluster().newClient(); // create a volume and a FSO bucket - fsoOzoneBucket = TestDataUtil + fsoOzoneBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java index f64d91f8e122..a356201c3b19 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java @@ -138,6 +138,7 @@ import org.apache.hadoop.hdds.utils.FaultInjector; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OmUtils; @@ -146,7 +147,6 @@ import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneManagerVersion; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.audit.AuditLogTestUtils; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; @@ -1116,19 +1116,19 @@ public void testDeleteAuditLog() throws Exception { // create a three replica file String keyName1 = "key1"; - TestDataUtil.createKey(bucket, keyName1, ReplicationConfig + DataTestUtil.createKey(bucket, keyName1, ReplicationConfig .fromTypeAndFactor(RATIS, THREE), value); // create a EC replica file String keyName2 = "key2"; ReplicationConfig replicationConfig = new ECReplicationConfig("rs-3-2-1024k"); - TestDataUtil.createKey(bucket, keyName2, replicationConfig, value); + DataTestUtil.createKey(bucket, keyName2, replicationConfig, value); // create a directory and a file String dirName = "dir1"; bucket.createDirectory(dirName); String keyName3 = "key3"; - TestDataUtil.createKey(bucket, keyName3, ReplicationConfig + DataTestUtil.createKey(bucket, keyName3, ReplicationConfig .fromTypeAndFactor(RATIS, THREE), value); // delete files and directory @@ -1139,11 +1139,11 @@ public void testDeleteAuditLog() throws Exception { // create keys for deleteKeys case String keyName4 = "key4"; - TestDataUtil.createKey(bucket, dirName + "/" + keyName4, + DataTestUtil.createKey(bucket, dirName + "/" + keyName4, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value); String keyName5 = "key5"; - TestDataUtil.createKey(bucket, dirName + "/" + keyName5, replicationConfig, value); + DataTestUtil.createKey(bucket, dirName + "/" + keyName5, replicationConfig, value); List keysToDelete = new ArrayList<>(); keysToDelete.add(dirName + "/" + keyName4); @@ -1264,7 +1264,7 @@ public void testPutKeyWithReplicationConfig(String replicationValue, ReplicationConfig replicationConfig = new ECReplicationConfig(replicationValue); if (isValidReplicationConfig) { - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, replicationConfig, value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); assertEquals(keyName, key.getName()); @@ -1295,7 +1295,7 @@ public void testPutKey() throws IOException { for (int i = 0; i < 10; i++) { String keyName = UUID.randomUUID().toString(); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); @@ -2211,7 +2211,7 @@ public void testValidateBlockLengthWithCommitKey() throws IOException { String keyName = UUID.randomUUID().toString(); // create the initial key with size 0, write will allocate the first block. - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); OmKeyArgs.Builder builder = new OmKeyArgs.Builder(); @@ -2245,7 +2245,7 @@ public void testPutKeyRatisOneNode() throws IOException { for (int i = 0; i < 10; i++) { String keyName = UUID.randomUUID().toString(); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); @@ -2278,7 +2278,7 @@ public void testPutKeyRatisThreeNodes() throws IOException { for (int i = 0; i < 10; i++) { String keyName = UUID.randomUUID().toString(); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); @@ -2317,7 +2317,7 @@ public void testPutKeyRatisThreeNodesParallel() throws IOException, String keyName = UUID.randomUUID().toString(); String data = Arrays.toString(generateData(5 * 1024 * 1024, (byte) RandomUtils.secure().randomLong())); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), data.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); @@ -2391,7 +2391,7 @@ private void createAndCorruptKey(String volumeName, String bucketName, OzoneBucket bucket = volume.getBucket(bucketName); // Write data into a key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); @@ -2451,7 +2451,7 @@ public void testGetKeyDetails() throws IOException { String keyValue = RandomStringUtils.secure().next(128); //String keyValue = "this is a test value.glx"; // create the initial key with size 0, write will allocate the first block. - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), keyValue.getBytes(UTF_8)); @@ -2544,7 +2544,7 @@ public void testReadKeyWithCorruptedData() throws IOException { String keyName = UUID.randomUUID().toString(); // Write data into a key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); @@ -2593,14 +2593,14 @@ void testZReadKeyWithUnhealthyContainerReplica() throws Exception { String keyName1 = UUID.randomUUID().toString(); // Write first key - TestDataUtil.createKey(bucket, keyName1, + DataTestUtil.createKey(bucket, keyName1, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); // Write second key String keyName2 = UUID.randomUUID().toString(); value = "unhealthy container replica"; - TestDataUtil.createKey(bucket, keyName2, + DataTestUtil.createKey(bucket, keyName2, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); @@ -2686,7 +2686,7 @@ void testReadKeyWithCorruptedDataWithMutiNodes() throws IOException { String keyName = UUID.randomUUID().toString(); // Write data into a key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); @@ -2753,7 +2753,7 @@ public void testDeleteKey() OzoneVolume volume = store.getVolume(volumeName); volume.createBucket(bucketName); OzoneBucket bucket = volume.getBucket(bucketName); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); @@ -3044,16 +3044,16 @@ public void testListKey() String keyBaseA = "key-a-"; for (int i = 0; i < 10; i++) { byte[] value = RandomStringUtils.secure().nextAscii(10240).getBytes(UTF_8); - TestDataUtil.createKey(volAbucketA, + DataTestUtil.createKey(volAbucketA, keyBaseA + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volAbucketB, + DataTestUtil.createKey(volAbucketB, keyBaseA + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volBbucketA, + DataTestUtil.createKey(volBbucketA, keyBaseA + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volBbucketB, + DataTestUtil.createKey(volBbucketB, keyBaseA + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); } @@ -3065,16 +3065,16 @@ public void testListKey() String keyBaseB = "key-b-"; for (int i = 0; i < 10; i++) { byte[] value = RandomStringUtils.secure().nextAscii(10240).getBytes(UTF_8); - TestDataUtil.createKey(volAbucketA, + DataTestUtil.createKey(volAbucketA, keyBaseB + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volAbucketB, + DataTestUtil.createKey(volAbucketB, keyBaseB + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volBbucketA, + DataTestUtil.createKey(volBbucketA, keyBaseB + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); - TestDataUtil.createKey(volBbucketB, + DataTestUtil.createKey(volBbucketB, keyBaseB + i + "-" + RandomStringUtils.secure().nextNumeric(5), ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value); } @@ -3555,7 +3555,7 @@ public void testClientLeakDetector() throws Exception { OzoneBucket bucket = volume.getBucket(bucketName); byte[] data = new byte[10]; Arrays.fill(data, (byte) 1); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), data); client = null; @@ -4601,7 +4601,7 @@ private void validateOzoneAccessAcl(OzoneObj ozObj) throws IOException { } private void writeKey(String key1, OzoneBucket bucket) throws IOException { - TestDataUtil.createKey(bucket, key1, + DataTestUtil.createKey(bucket, key1, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), RandomStringUtils.secure().next(1024).getBytes(UTF_8)); } @@ -5004,7 +5004,7 @@ public void testHeadObject() throws IOException { String keyName = UUID.randomUUID().toString(); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, replicationConfig, value.getBytes(UTF_8)); OzoneKey key = bucket.headObject(keyName); @@ -5043,11 +5043,11 @@ private void createRequiredForVersioningTest(String volumeName, .setBucketLayout(VERSIONING_TEST_BUCKET_LAYOUT).build()); OzoneBucket bucket = volume.getBucket(bucketName); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, replicationConfig, value.getBytes(UTF_8)); // Override key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, replicationConfig, value.getBytes(UTF_8)); } @@ -5266,7 +5266,7 @@ void testGetKeyAndFileWithNetworkTopology() throws IOException { String keyName = UUID.randomUUID().toString(); // Write data into a key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, THREE), value.getBytes(UTF_8)); @@ -5550,7 +5550,7 @@ public void testPutObjectTagging(BucketLayout bucketLayout) throws Exception { String keyName = UUID.randomUUID().toString(); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, anyReplication(), value.getBytes(UTF_8)); OzoneKey key = bucket.getKey(keyName); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java index b04632389e7d..feed906807f1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBCSID.java @@ -35,8 +35,8 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientFactory; @@ -91,7 +91,7 @@ public static void shutdown() { @Test public void testBCSID() throws Exception { - TestDataUtil.createKey(objectStore.getVolume(volumeName).getBucket(bucketName), + DataTestUtil.createKey(objectStore.getVolume(volumeName).getBucket(bucketName), "ratis", ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "ratis".getBytes(UTF_8)); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java index dd4cb3eb911f..18920297b926 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestHybridPipelineOnDatanode.java @@ -38,8 +38,8 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.scm.pipeline.PipelineID; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -96,14 +96,14 @@ public void testHybridPipelineOnDatanode() throws IOException { String keyName1 = UUID.randomUUID().toString(); // Write data into a key - TestDataUtil.createKey(bucket, keyName1, + DataTestUtil.createKey(bucket, keyName1, ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), value.getBytes(UTF_8)); String keyName2 = UUID.randomUUID().toString(); // Write data into a key - TestDataUtil.createKey(bucket, keyName2, + DataTestUtil.createKey(bucket, keyName2, ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.THREE), value.getBytes(UTF_8)); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java index 281c5b2d5134..a4fc75397973 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java @@ -84,9 +84,9 @@ import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClientTestImpl; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.ozone.ClientConfigForTesting; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -299,7 +299,7 @@ static void createAndVerifyKeyData(OzoneBucket bucket) throws Exception { String keyName = UUID.randomUUID().toString(); String value = "sample value"; - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(StandardCharsets.UTF_8)); @@ -307,7 +307,7 @@ static void createAndVerifyKeyData(OzoneBucket bucket) throws Exception { OzoneKeyDetails key1 = bucket.getKey(keyName); // Overwrite the key - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, ReplicationConfig.fromTypeAndFactor(RATIS, ONE), value.getBytes(StandardCharsets.UTF_8)); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java index 703b37964f2b..03c706f19e33 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -102,7 +102,7 @@ private void createAndOverwriteKey(OzoneBucket bucket, String key, private static void writeKey(OzoneBucket bucket, String key, byte[] content, ReplicationConfig replication) throws IOException { - TestDataUtil.createKey(bucket, key, replication, content); + DataTestUtil.createKey(bucket, key, replication, content); } private void assertListStatus(OzoneBucket bucket, String keyName, diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java index 70989f07e5fd..15c9dec84731 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java @@ -36,8 +36,8 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -78,7 +78,7 @@ void testPutKeyAndGetKeyThreeNodes() throws Exception { String keyName = "a/b/c/" + UUID.randomUUID(); byte[] content = RandomUtils.secure().randomBytes(128); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, RatisReplicationConfig.getInstance(THREE), content); // First, confirm the key info from the client matches the info in OM. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java index 772ec0383fbe..4b53c2df8d51 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java @@ -20,11 +20,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS; import static org.apache.hadoop.hdds.security.SecurityConfig.OZONE_TEST_AUTHORIZATION_ENABLED; +import static org.apache.hadoop.ozone.DataTestUtil.cleanupDeletedTable; import static org.apache.hadoop.ozone.OzoneConsts.FORCE_LEASE_RECOVERY_ENV; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_OFS_URI_SCHEME; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_ROOT; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER; -import static org.apache.hadoop.ozone.TestDataUtil.cleanupDeletedTable; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY; import static org.apache.hadoop.ozone.om.helpers.BucketLayout.FILE_SYSTEM_OPTIMIZED; import static org.apache.ozone.test.GenericTestUtils.getTestStartTime; @@ -59,9 +59,9 @@ import org.apache.hadoop.hdds.utils.db.cache.CacheKey; import org.apache.hadoop.hdds.utils.db.cache.CacheValue; import org.apache.hadoop.ozone.ClientVersion; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -167,7 +167,7 @@ private void testPutKeySuccessWithBlockTokenWithBucketLayout( String keyName = UUID.randomUUID().toString(); long committedBytes = ozoneManager.getMetrics().getDataCommittedBytes(); - TestDataUtil.createKey(bucket, keyName, replication, value.getBytes(UTF_8)); + DataTestUtil.createKey(bucket, keyName, replication, value.getBytes(UTF_8)); assertEquals(committedBytes + value.getBytes(UTF_8).length, ozoneManager.getMetrics().getDataCommittedBytes()); 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 830610a6c7f5..ebfeb28e8b96 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 @@ -47,8 +47,8 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.scm.storage.StreamBlockInputStream; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -120,7 +120,7 @@ void testAsyncReadFailoverWhenDatanodeStopped() throws Exception { OzoneBucket bucket = createBucket(store); String keyName = newKeyName(); byte[] content = RandomUtils.secure().randomBytes(32 * 1024); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, RatisReplicationConfig.getInstance(THREE), content); List datanodes = getPipelineDatanodes(cluster, bucket, keyName); @@ -146,7 +146,7 @@ void testStreamReadFailoverWhenDatanodesStopped() throws Exception { OzoneBucket bucket = createBucket(store); String keyName = newKeyName(); byte[] content = RandomUtils.secure().randomBytes(32 * 1024); - TestDataUtil.createKey(bucket, keyName, + DataTestUtil.createKey(bucket, keyName, RatisReplicationConfig.getInstance(THREE), content); List datanodes = getPipelineDatanodes(cluster, bucket, keyName); 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 21ce4490d789..5db278189492 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 @@ -62,9 +62,9 @@ import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementRandom; import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager.ReplicationManagerConfiguration; import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -171,18 +171,18 @@ private static OzoneConfiguration createConfiguration() { } private void createTestData(OzoneClient client) throws IOException { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, VOLUME, BUCKET); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, VOLUME, BUCKET); - TestDataUtil.createKey(bucket, KEY, + DataTestUtil.createKey(bucket, KEY, RatisReplicationConfig.getInstance(THREE), "Hello".getBytes(UTF_8)); } private byte[] createTestData(OzoneClient client, int size) throws IOException { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, VOLUME, BUCKET); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, VOLUME, BUCKET); byte[] b = RandomUtils.secure().randomBytes(size); - TestDataUtil.createKey(bucket, KEY, + DataTestUtil.createKey(bucket, KEY, new ECReplicationConfig("RS-3-2-1k"), b); return b; } 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 415b991e5b81..287ed05604ac 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 @@ -47,8 +47,8 @@ import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -149,7 +149,7 @@ void testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReported() throws Except ReplicationInput replicationInput = testCase.getRight(); // create a container and close it String key = "key" + keyCount; - TestDataUtil.createKey(bucket, key, replicationInput.getReplicationConfig(), "Hello".getBytes(UTF_8)); + DataTestUtil.createKey(bucket, key, replicationInput.getReplicationConfig(), "Hello".getBytes(UTF_8)); List keyLocations = lookupKey(cluster, key); assertThat(keyLocations).isNotEmpty(); OmKeyLocationInfo keyLocation = keyLocations.get(0); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java index bd167bbf3c75..43f7139b216b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java @@ -45,10 +45,10 @@ import org.apache.hadoop.hdds.scm.client.ScmClient; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline; import org.apache.hadoop.hdfs.server.datanode.checker.VolumeCheckResult; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKeyDetails; @@ -77,7 +77,7 @@ class TestDatanodeHddsVolumeFailureDetection { void corruptChunkFile(boolean schemaV3) throws Exception { try (MiniOzoneCluster cluster = newCluster(schemaV3)) { try (OzoneClient client = cluster.newClient()) { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); // write a file String keyName = UUID.randomUUID().toString(); @@ -175,7 +175,7 @@ void corruptContainerFile(boolean schemaV3) throws Exception { void corruptDbFile(boolean schemaV3) throws Exception { try (MiniOzoneCluster cluster = newCluster(schemaV3)) { try (OzoneClient client = cluster.newClient()) { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); // write a file, will create container1 String keyName = UUID.randomUUID().toString(); @@ -248,7 +248,7 @@ void corruptDbFile(boolean schemaV3) throws Exception { void corruptDbFileWithoutDbHandleCacheInvalidation(boolean schemaV3) throws Exception { try (MiniOzoneCluster cluster = newCluster(schemaV3)) { try (OzoneClient client = cluster.newClient()) { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); // write a file, will create container1 String keyName = UUID.randomUUID().toString(); @@ -343,7 +343,7 @@ private static long createKey(OzoneBucket bucket, String key) byte[] bytes = RandomUtils.secure().randomBytes(KEY_SIZE); RatisReplicationConfig replication = RatisReplicationConfig.getInstance(ReplicationFactor.ONE); - TestDataUtil.createKey(bucket, key, replication, bytes); + DataTestUtil.createKey(bucket, key, replication, bytes); OzoneKeyDetails keyDetails = bucket.getKey(key); assertEquals(key, keyDetails.getName()); return keyDetails.getOzoneKeyLocations().get(0).getContainerID(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java index 38c776644052..224896640a69 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteFileOps.java @@ -27,8 +27,8 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.freon.OmBucketTestUtils.ParameterBuilder; import org.apache.ozone.test.NonHATests; @@ -106,7 +106,7 @@ static List parameters() { @MethodSource("parameters") void testOmBucketReadWriteFileOps(ParameterBuilder parameterBuilder) throws Exception { try (OzoneClient client = cluster().newClient()) { - TestDataUtil.createVolumeAndBucket(client, + DataTestUtil.createVolumeAndBucket(client, parameterBuilder.getVolumeName(), parameterBuilder.getBucketName(), parameterBuilder.getBucketArgs().build() diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java index dc6c3438d4bc..1cf361ddaba6 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestOmBucketReadWriteKeyOps.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; import org.apache.hadoop.hdds.utils.IOUtils; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKey; @@ -115,7 +115,7 @@ static List parameters() { @ParameterizedTest(name = "{0}") @MethodSource("parameters") void testOmBucketReadWriteKeyOps(ParameterBuilder parameterBuilder) throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, parameterBuilder.getVolumeName(), parameterBuilder.getBucketName(), parameterBuilder.getBucketArgs().setBucketLayout(BucketLayout.OBJECT_STORE).build() diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java index a4a10f0491bb..305eabdb9613 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/local/TestLocalOzoneClusterRuntime.java @@ -29,7 +29,7 @@ import java.time.Duration; import java.util.UUID; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientFactory; @@ -99,11 +99,11 @@ private void startRuntimeAndCreateKey(LocalOzoneClusterConfig config, try (OzoneClient client = OzoneClientFactory.getRpcClient(clientConf)) { OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); // Writing and reading back a key proves the datanodes registered and // SCM left safe mode, so the cluster is actually usable. - TestDataUtil.createKey(bucket, keyName, KEY_CONTENT.getBytes(UTF_8)); - assertEquals(KEY_CONTENT, TestDataUtil.getKey(bucket, keyName)); + DataTestUtil.createKey(bucket, keyName, KEY_CONTENT.getBytes(UTF_8)); + assertEquals(KEY_CONTENT, DataTestUtil.getKey(bucket, keyName)); } } } @@ -124,7 +124,7 @@ private void restartRuntimeAndVerifyKey(LocalOzoneClusterConfig config, assertEquals(bucketName, bucket.getName()); // Key data written before the restart is still readable from the // persistent datanode storage. - assertEquals(KEY_CONTENT, TestDataUtil.getKey(bucket, keyName)); + assertEquals(KEY_CONTENT, DataTestUtil.getKey(bucket, keyName)); } } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java index 4c07c091d588..724a4d4fccf3 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/BucketForTesting.java @@ -27,7 +27,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -78,7 +78,7 @@ public byte[] writeKey(String key, ReplicationConfig repConfig, int len) public void writeKey(String key, ReplicationConfig repConfig, byte[] inputData) throws IOException { - TestDataUtil.createKey(bucket, key, repConfig, inputData); + DataTestUtil.createKey(bucket, key, repConfig, inputData); } public byte[] writeRandomBytes(String keyName, int dataLength) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java index 08961fc47739..71a9ab3c02ac 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java @@ -24,8 +24,8 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.StorageTypeProto; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.ozone.ClientVersion; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -58,17 +58,17 @@ public void testCreateBucketWithOlderClient() throws Exception { // create a volume and a bucket without bucket layout argument BucketLayout defaultLayout = cluster().getConf().getEnum(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT, BucketLayout.FILE_SYSTEM_OPTIMIZED); - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, null); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, null); String volumeName = bucket.getVolumeName(); // OM defaulted bucket layout assertEquals(defaultLayout, bucket.getBucketLayout()); // Sets bucket layout explicitly. - OzoneBucket fsobucket = TestDataUtil + OzoneBucket fsobucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED, fsobucket.getBucketLayout()); - OzoneBucket obsBucket = TestDataUtil.createVolumeAndBucket(client, BucketLayout.OBJECT_STORE); + OzoneBucket obsBucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.OBJECT_STORE); assertEquals(BucketLayout.OBJECT_STORE, obsBucket.getBucketLayout()); // Create bucket request by an older client. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java index 918e738c43cb..642be2a8b6ce 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java @@ -17,8 +17,8 @@ package org.apache.hadoop.ozone.om; +import static org.apache.hadoop.ozone.DataTestUtil.createKey; import static org.apache.hadoop.ozone.OzoneAcl.AclScope.DEFAULT; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; import static org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType.USER; import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java index 2a09ffc5ddc4..0f1973cd41db 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java @@ -30,8 +30,8 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -103,7 +103,7 @@ public void testKeysPurgingByKeyDeletingService() throws Exception { for (int i = 1; i <= NUM_KEYS; i++) { String keyName = keyBase + "-" + i; keys.add(keyName); - TestDataUtil.createKey(bucket, keyName, data); + DataTestUtil.createKey(bucket, keyName, data); } // Delete created keys diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java index 8772216b8228..e983c931c482 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java @@ -36,7 +36,7 @@ import org.apache.commons.io.IOUtils; import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientFactory; @@ -79,11 +79,11 @@ void init() throws Exception { client = OzoneClientFactory.getRpcClient(conf); // create a volume and a LEGACY bucket - legacyOzoneBucket = TestDataUtil + legacyOzoneBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.LEGACY); // create a volume and a OBJECT_STORE bucket - obsOzoneBucket = TestDataUtil + obsOzoneBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.OBJECT_STORE); initFSNameSpace(); @@ -369,7 +369,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); + byte[] input = DataTestUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. readkey(ozoneBucket, key, 10, input); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java index 30d38a6abbb3..6929dac516ab 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.StorageType; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -83,7 +83,7 @@ void init() throws Exception { client = OzoneClientFactory.getRpcClient(conf); // create a volume and a LEGACY bucket - legacyOzoneBucket = TestDataUtil + legacyOzoneBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.LEGACY); String volumeName = legacyOzoneBucket.getVolumeName(); @@ -662,7 +662,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); + byte[] input = DataTestUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. readkey(ozoneBucket, key, 10, input); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java index 2e4f2362f83a..0406f34ade67 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.utils.IOUtils; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientFactory; @@ -65,7 +65,7 @@ void init() throws Exception { client = OzoneClientFactory.getRpcClient(conf); // create a volume and a LEGACY bucket - fsoOzoneBucket = TestDataUtil + fsoOzoneBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); buildNameSpaceTree(fsoOzoneBucket); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java index d9fe8a7543da..34f8a328ece8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java @@ -105,9 +105,9 @@ import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.DBCheckpoint; import org.apache.hadoop.hdds.utils.db.DBStore; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.lock.BootstrapStateHandler; @@ -705,14 +705,14 @@ private void setupGetMethod(Collection toExcludeList) { private void prepSnapshotData() throws Exception { metaDir = OMStorage.getOmDbDir(conf); - OzoneBucket bucket = TestDataUtil + OzoneBucket bucket = DataTestUtil .createVolumeAndBucket(client); // Create dummy keys for snapshotting. - TestDataUtil.createKey(bucket, UUID.randomUUID().toString(), ReplicationConfig + DataTestUtil.createKey(bucket, UUID.randomUUID().toString(), ReplicationConfig .fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "content".getBytes(StandardCharsets.UTF_8)); - TestDataUtil.createKey(bucket, UUID.randomUUID().toString(), ReplicationConfig + DataTestUtil.createKey(bucket, UUID.randomUUID().toString(), ReplicationConfig .fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "content".getBytes(StandardCharsets.UTF_8)); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServletInodeBasedXfer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServletInodeBasedXfer.java index 518c762976a2..8bf1fbfd8ad1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServletInodeBasedXfer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServletInodeBasedXfer.java @@ -105,9 +105,9 @@ import org.apache.hadoop.hdds.utils.db.DBStore; import org.apache.hadoop.hdds.utils.db.InodeMetadataRocksDBCheckpoint; import org.apache.hadoop.hdfs.web.URLConnectionFactory; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneSnapshot; @@ -556,9 +556,9 @@ public void testBootstrapOnFollowerConsistency() throws Exception { om.getKeyManager().getSnapshotSstFilteringService().pause(); om.getKeyManager().getSnapshotDeletingService().suspend(); // Create test data and snapshots - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); // Create key before first snapshot - TestDataUtil.createKey(bucket, "key1", + DataTestUtil.createKey(bucket, "key1", ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "data1".getBytes(StandardCharsets.UTF_8)); client.getObjectStore().createSnapshot(volumeName, bucketName, "snapshot1"); @@ -821,10 +821,10 @@ public void testCheckpointIncludesSnapshotsFromFrozenState() throws Exception { om.getKeyManager().getSnapshotSstFilteringService().pause(); // Create test data and snapshots - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); // Create key before first snapshot - TestDataUtil.createKey(bucket, "key1", + DataTestUtil.createKey(bucket, "key1", ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "data1".getBytes(StandardCharsets.UTF_8)); client.getObjectStore().createSnapshot(volumeName, bucketName, "snapshot1"); @@ -1134,18 +1134,18 @@ private static String getInode(String inodeAndMtime) { } private void writeData(String volumeName, String bucketName, boolean includeSnapshots) throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); for (int i = 0; i < 10; i++) { - TestDataUtil.createKey(bucket, "key" + i, + DataTestUtil.createKey(bucket, "key" + i, ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "sample".getBytes(StandardCharsets.UTF_8)); om.getMetadataManager().getStore().flushDB(); } if (includeSnapshots) { - TestDataUtil.createKey(bucket, "keysnap1", + DataTestUtil.createKey(bucket, "keysnap1", ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "sample".getBytes(StandardCharsets.UTF_8)); - TestDataUtil.createKey(bucket, "keysnap2", + DataTestUtil.createKey(bucket, "keysnap2", ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.ONE), "sample".getBytes(StandardCharsets.UTF_8)); client.getObjectStore().createSnapshot(volumeName, bucketName, "snapshot10"); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshotTransfer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshotTransfer.java index ba5d3401a8d7..12551fdb9b84 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshotTransfer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshotTransfer.java @@ -17,8 +17,8 @@ package org.apache.hadoop.ozone.om; +import static org.apache.hadoop.ozone.DataTestUtil.readFully; import static org.apache.hadoop.ozone.OzoneConsts.OM_DB_NAME; -import static org.apache.hadoop.ozone.TestDataUtil.readFully; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_MAX_TOTAL_SST_SIZE_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.om.OmSnapshotManager.OM_HARDLINK_FILE; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java index cb9d0d821bd3..1925b6a204a5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java @@ -18,8 +18,8 @@ package org.apache.hadoop.ozone.om; import static org.apache.hadoop.hdds.utils.IOUtils.getINode; +import static org.apache.hadoop.ozone.DataTestUtil.readFully; import static org.apache.hadoop.ozone.OzoneConsts.OM_DB_NAME; -import static org.apache.hadoop.ozone.TestDataUtil.readFully; import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPath; import static org.apache.hadoop.ozone.om.TestOzoneManagerHAWithStoppedNodes.createKey; import static org.apache.ozone.test.OzoneTestBase.uniqueObjectName; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java index aec305cc282f..2d2e8efc49d0 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java @@ -22,8 +22,8 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.BucketLayout; @@ -69,19 +69,19 @@ public void testRestartWithFSOLayout() throws Exception { startCluster(conf); // 2. create bucket with FSO bucket layout and verify - OzoneBucket bucket1 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket1 = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); verifyBucketLayout(bucket1, BucketLayout.FILE_SYSTEM_OPTIMIZED); // 3. verify OM default behavior with empty restartCluster(); - OzoneBucket bucket2 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket2 = DataTestUtil.createVolumeAndBucket(client, null); verifyBucketLayout(bucket2, BucketLayout.FILE_SYSTEM_OPTIMIZED); // 4. create bucket with OBS bucket layout and verify restartCluster(); - OzoneBucket bucket3 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket3 = DataTestUtil.createVolumeAndBucket(client, BucketLayout.OBJECT_STORE); verifyBucketLayout(bucket3, BucketLayout.OBJECT_STORE); @@ -113,19 +113,19 @@ public void testRestartWithOBSLayout() throws Exception { startCluster(conf); // 2. create bucket with FSO bucket layout and verify - OzoneBucket bucket1 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket1 = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); verifyBucketLayout(bucket1, BucketLayout.FILE_SYSTEM_OPTIMIZED); // 3. verify OM default behavior with empty restartCluster(); - OzoneBucket bucket2 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket2 = DataTestUtil.createVolumeAndBucket(client, null); verifyBucketLayout(bucket2, BucketLayout.OBJECT_STORE); // 4. create bucket with OBS bucket layout and verify restartCluster(); - OzoneBucket bucket3 = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket3 = DataTestUtil.createVolumeAndBucket(client, BucketLayout.OBJECT_STORE); verifyBucketLayout(bucket3, BucketLayout.OBJECT_STORE); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java index 08023120f9ff..025a472e9a6b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java @@ -54,10 +54,10 @@ import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OmUtils; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -100,7 +100,7 @@ void init() throws Exception { cluster = cluster(); client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket bucket = TestDataUtil + OzoneBucket bucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); volumeName = bucket.getVolumeName(); bucketName = bucket.getName(); @@ -210,7 +210,7 @@ public void testCreateKey() throws Exception { @Test public void testDeleteBucketWithKeys() throws Exception { // Create temporary volume and bucket for this test. - OzoneBucket testBucket = TestDataUtil + OzoneBucket testBucket = DataTestUtil .createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); String testVolumeName = testBucket.getVolumeName(); String testBucketName = testBucket.getName(); @@ -556,7 +556,7 @@ private void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); + byte[] input = DataTestUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. readKey(ozoneBucket, key, 10, input); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java index 71a3ac2af7b7..7904666b9515 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java @@ -37,8 +37,8 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -100,7 +100,7 @@ public void init() throws Exception { bucketName = RandomStringUtils.secure().nextAlphabetic(10).toLowerCase(); // create a volume and a bucket to be used by OzoneFileSystem - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.OBJECT_STORE); volume = client.getObjectStore().getVolume(volumeName); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java index 8faf7d973cff..90d6b128e745 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java @@ -35,9 +35,9 @@ import java.util.Collections; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneAcl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.audit.AuditEventStatus; import org.apache.hadoop.ozone.audit.AuditLogTestUtils; import org.apache.hadoop.ozone.audit.OMAction; @@ -112,7 +112,7 @@ public void testCreateVolumePermissionDenied() throws Exception { authorizer.volumeAclAllow = false; OMException exception = assertThrows(OMException.class, - () -> TestDataUtil.createVolumeAndBucket(client)); + () -> DataTestUtil.createVolumeAndBucket(client)); assertEquals(ResultCodes.PERMISSION_DENIED, exception.getResult()); assertThat(logCapturer.getOutput()) @@ -122,7 +122,7 @@ public void testCreateVolumePermissionDenied() throws Exception { @Test public void testReadVolumePermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); authorizer.volumeAclAllow = false; ObjectStore objectStore = client.getObjectStore(); OMException exception = assertThrows(OMException.class, () -> @@ -139,7 +139,7 @@ public void testCreateBucketPermissionDenied() throws Exception { authorizer.bucketAclAllow = false; OMException exception = assertThrows(OMException.class, - () -> TestDataUtil.createVolumeAndBucket(client)); + () -> DataTestUtil.createVolumeAndBucket(client)); assertEquals(ResultCodes.PERMISSION_DENIED, exception.getResult()); assertThat(logCapturer.getOutput()) @@ -149,7 +149,7 @@ public void testCreateBucketPermissionDenied() throws Exception { @Test public void testReadBucketPermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); authorizer.bucketAclAllow = false; ObjectStore objectStore = client.getObjectStore(); OMException exception = assertThrows(OMException.class, @@ -167,10 +167,10 @@ public void testReadBucketPermissionDenied() throws Exception { public void testCreateKeyPermissionDenied() throws Exception { authorizer.keyAclAllow = false; - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); OMException exception = assertThrows(OMException.class, - () -> TestDataUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8))); + () -> DataTestUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8))); assertEquals(ResultCodes.PERMISSION_DENIED, exception.getResult()); assertThat(logCapturer.getOutput()).contains("doesn't have CREATE " + "permission to access key"); @@ -178,12 +178,12 @@ public void testCreateKeyPermissionDenied() throws Exception { @Test public void testReadKeyPermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); - TestDataUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8)); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); + DataTestUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8)); authorizer.keyAclAllow = false; OMException exception = assertThrows(OMException.class, - () -> TestDataUtil.getKey(bucket, "testKey")); + () -> DataTestUtil.getKey(bucket, "testKey")); assertEquals(ResultCodes.PERMISSION_DENIED, exception.getResult()); assertThat(logCapturer.getOutput()).contains("doesn't have READ " + @@ -193,8 +193,8 @@ public void testReadKeyPermissionDenied() throws Exception { @Test public void testGetFileStatusPermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); - TestDataUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8)); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); + DataTestUtil.createKey(bucket, "testKey", "testcontent".getBytes(StandardCharsets.UTF_8)); authorizer.keyAclAllow = false; OMException exception = assertThrows(OMException.class, @@ -208,7 +208,7 @@ public void testGetFileStatusPermissionDenied() throws Exception { @Test public void testSetACLPermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); authorizer.bucketAclAllow = false; @@ -222,9 +222,9 @@ public void testSetACLPermissionDenied() throws Exception { @Test public void testKeyACLOpsPermissionDenied() throws Exception { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); String keyName = "testKey"; - TestDataUtil.createKey(bucket, keyName, "testcontent".getBytes(StandardCharsets.UTF_8)); + DataTestUtil.createKey(bucket, keyName, "testcontent".getBytes(StandardCharsets.UTF_8)); authorizer.keyAclAllow = false; ObjectStore objectStore = client.getObjectStore(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java index 85ba7c95b001..463227746cce 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hdds.client.StandaloneReplicationConfig; import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList; import org.apache.hadoop.hdds.utils.IOUtils; -import org.apache.hadoop.ozone.TestDataUtil; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.helpers.OmKeyArgs; @@ -73,7 +73,7 @@ public void testAllocateCommit() throws Exception { String keyName = uniqueObjectName("key"); OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); // Versioning isn't supported currently, but just preserving old behaviour bucket.setVersioning(true); @@ -155,7 +155,7 @@ public void testReadLatestVersion() throws Exception { String keyName = uniqueObjectName("key"); OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName); OmKeyArgs omKeyArgs = new OmKeyArgs.Builder() .setVolumeName(volumeName) @@ -166,8 +166,8 @@ public void testReadLatestVersion() throws Exception { String dataString = RandomStringUtils.secure().nextAlphabetic(100); - TestDataUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); - assertEquals(dataString, TestDataUtil.getKey(bucket, keyName)); + DataTestUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); + assertEquals(dataString, DataTestUtil.getKey(bucket, keyName)); OmKeyInfo keyInfo = ozoneManager.lookupKey(omKeyArgs); assertEquals(0, keyInfo.getLatestVersionLocations().getVersion()); assertEquals(1, @@ -175,19 +175,19 @@ public void testReadLatestVersion() throws Exception { // When bucket versioning is disabled, overwriting a key doesn't increment // its version count. Rather it always resets the version to 0 - TestDataUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); + DataTestUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); keyInfo = ozoneManager.lookupKey(omKeyArgs); - assertEquals(dataString, TestDataUtil.getKey(bucket, keyName)); + assertEquals(dataString, DataTestUtil.getKey(bucket, keyName)); assertEquals(0, keyInfo.getLatestVersionLocations().getVersion()); assertEquals(1, keyInfo.getLatestVersionLocations().getLocationList().size()); dataString = RandomStringUtils.secure().nextAlphabetic(200); - TestDataUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); + DataTestUtil.createKey(bucket, keyName, dataString.getBytes(StandardCharsets.UTF_8)); keyInfo = ozoneManager.lookupKey(omKeyArgs); - assertEquals(dataString, TestDataUtil.getKey(bucket, keyName)); + assertEquals(dataString, DataTestUtil.getKey(bucket, keyName)); assertEquals(0, keyInfo.getLatestVersionLocations().getVersion()); assertEquals(1, keyInfo.getLatestVersionLocations().getLocationList().size()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java index add7f839d07f..92974a69ee91 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java @@ -61,10 +61,10 @@ import org.apache.hadoop.hdds.utils.db.RocksDatabaseException; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.metrics2.MetricsRecordBuilder; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.exceptions.OMException; @@ -352,7 +352,7 @@ public void testKeyOps() throws Exception { long initialNumDeleteObjectTaggingFails = getLongCounter("NumDeleteObjectTaggingFails", omMetrics); // see HDDS-10078 for making this work with FILE_SYSTEM_OPTIMIZED layout - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.LEGACY); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, BucketLayout.LEGACY); OmKeyArgs keyArgs = createKeyArgs(volumeName, bucketName, RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE)); doKeyOps(keyArgs); // This will perform 7 different operations on the key @@ -483,7 +483,7 @@ public void testDirectoryOps(BucketLayout bucketLayout) throws Exception { String bucketName = UUID.randomUUID().toString(); // create bucket with different layout in each ParameterizedTest - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, bucketLayout); + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, bucketLayout); // Create bucket with 2 nested directories. String rootPath = String.format("%s://%s/", diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java index 93eeae9f3e48..3183d6e72eee 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java @@ -39,8 +39,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneVolume; import org.apache.hadoop.ozone.client.protocol.ClientProtocol; @@ -388,7 +388,7 @@ private void writeTestData(String volumeName, String keyString = UUID.randomUUID().toString(); byte[] data = ContainerTestHelper.getFixedLengthString( keyString, 100).getBytes(UTF_8); - TestDataUtil.createKey(store.getVolume(volumeName). + DataTestUtil.createKey(store.getVolume(volumeName). getBucket(bucketName), keyName, data); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java index 70f2ff5e158d..9df0d34e62c4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java @@ -17,7 +17,7 @@ package org.apache.hadoop.ozone.om; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; +import static org.apache.hadoop.ozone.DataTestUtil.createKey; import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE; import static org.apache.ozone.test.OzoneTestBase.uniqueObjectName; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -31,8 +31,8 @@ import java.util.List; import java.util.UUID; import org.apache.hadoop.hdds.protocol.StorageType; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneAcl; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -330,7 +330,7 @@ private void createKeys(ObjectStore objectStore, OzoneBucket ozoneBucket, String aclWorldAll = "world::a"; for (String key : keys) { - TestDataUtil.createStringKey(ozoneBucket, key, 10); + DataTestUtil.createStringKey(ozoneBucket, key, 10); setKeyAcl(objectStore, ozoneBucket.getVolumeName(), ozoneBucket.getName(), key, aclWorldAll); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java index fcb7478e26b0..aba4812f6373 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java @@ -60,9 +60,9 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -124,7 +124,7 @@ public void shutdown() { @Test void testSafeModeOperations() throws Exception { - TestDataUtil.createKeys(cluster, 100); + DataTestUtil.createKeys(cluster, 100); final List containers = cluster .getStorageContainerManager().getContainerManager().getContainers(); GenericTestUtils.waitFor(() -> containers.size() >= 3, 100, 1000); @@ -204,7 +204,7 @@ void testClusterExitsSafeModeWithPeriodicRuleRefresh() throws Exception { cluster = builder.build(); cluster.waitForClusterToBeReady(); final StorageContainerManager scm = cluster.getStorageContainerManager(); - TestDataUtil.createKeys(cluster, 100); + DataTestUtil.createKeys(cluster, 100); GenericTestUtils.waitFor(() -> scm.getContainerManager().getContainers().size() >= 3, 100, 1000 * 30); @@ -233,7 +233,7 @@ void testSCMSafeMode() throws Exception { assertFalse(cluster.getStorageContainerManager().isInSafeMode()); // Test2: Test safe mode when containers are there in system. - TestDataUtil.createKeys(cluster, 100 * 2); + DataTestUtil.createKeys(cluster, 100 * 2); final List containers = cluster .getStorageContainerManager().getContainerManager().getContainers(); GenericTestUtils.waitFor(() -> containers.size() >= 3, 100, 1000 * 30); @@ -304,7 +304,7 @@ public void testSCMSafeModeRestrictedOp() throws Exception { cluster.waitTobeOutOfSafeMode(); assertFalse(scm.isInSafeMode()); - TestDataUtil.createKeys(cluster, 10); + DataTestUtil.createKeys(cluster, 10); SCMClientProtocolServer clientProtocolServer = cluster .getStorageContainerManager().getClientProtocolServer(); assertFalse((scm.getClientProtocolServer()).getSafeModeStatus()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingServiceWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingServiceWithFSO.java index e64a3f09e216..d516a74a12bd 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingServiceWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingServiceWithFSO.java @@ -54,9 +54,9 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -122,7 +122,7 @@ public static void init() throws Exception { client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); volumeName = bucket.getVolumeName(); bucketName = bucket.getName(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRootedDDSWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRootedDDSWithFSO.java index 6db7c1f6b7f1..54faa6d8daeb 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRootedDDSWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestRootedDDSWithFSO.java @@ -41,9 +41,9 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.OMConfigKeys; @@ -92,7 +92,7 @@ public static void init() throws Exception { // create a volume and a bucket to be used by OzoneFileSystem OzoneBucket bucket = - TestDataUtil.createVolumeAndBucket(client, getFSOBucketLayout()); + DataTestUtil.createVolumeAndBucket(client, getFSOBucketLayout()); String volumeName = bucket.getVolumeName(); volumePath = new Path(OZONE_URI_DELIMITER, volumeName); String bucketName = bucket.getName(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java index ab2bb7c5e0f6..f276c4bd3930 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java @@ -55,9 +55,9 @@ import org.apache.hadoop.hdds.conf.StorageUnit; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -146,7 +146,7 @@ public void setup() throws Exception { cluster.waitForClusterToBeReady(); client = cluster.newClient(); om = cluster.getOzoneManager(); - bucket1 = TestDataUtil.createVolumeAndBucket( + bucket1 = DataTestUtil.createVolumeAndBucket( client, VOLUME_NAME, BUCKET_NAME_ONE, BucketLayout.DEFAULT); } @@ -218,11 +218,11 @@ public void testMultipleSnapshotKeyReclaim() throws Exception { .setBucketLayout(BucketLayout.LEGACY) .build(); - OzoneBucket bucket2 = TestDataUtil.createBucket( + OzoneBucket bucket2 = DataTestUtil.createBucket( client, VOLUME_NAME, bucketArgs, BUCKET_NAME_TWO); // Create key1 and key2 - TestDataUtil.createKey(bucket2, "bucket2key1", CONTENT.array()); - TestDataUtil.createKey(bucket2, "bucket2key2", CONTENT.array()); + DataTestUtil.createKey(bucket2, "bucket2key1", CONTENT.array()); + DataTestUtil.createKey(bucket2, "bucket2key2", CONTENT.array()); // Create Snapshot client.getObjectStore().createSnapshot(VOLUME_NAME, BUCKET_NAME_TWO, @@ -275,7 +275,7 @@ public void testSnapshotWithFSO() throws Exception { BucketArgs bucketArgs = new BucketArgs.Builder() .setBucketLayout(BucketLayout.FILE_SYSTEM_OPTIMIZED) .build(); - OzoneBucket bucket2 = TestDataUtil.createBucket( + OzoneBucket bucket2 = DataTestUtil.createBucket( client, VOLUME_NAME, bucketArgs, BUCKET_NAME_FSO); assertTableRowCount(snapshotInfoTable, 0); @@ -286,12 +286,12 @@ public void testSnapshotWithFSO() throws Exception { om.getKeyManager().getDeletingService().suspend(); // Create 10 keys for (int i = 1; i <= 10; i++) { - TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array()); + DataTestUtil.createKey(bucket2, "key" + i, CONTENT.array()); } // Create 5 keys to overwrite for (int i = 11; i <= 15; i++) { - TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array()); + DataTestUtil.createKey(bucket2, "key" + i, CONTENT.array()); } // Create Directory and Sub @@ -304,7 +304,7 @@ public void testSnapshotWithFSO() throws Exception { String childDir = "/childDir" + j; client.getProxy().createDirectory(VOLUME_NAME, BUCKET_NAME_FSO, parent + childDir); - TestDataUtil.createKey(bucket2, parent + childFile, CONTENT.array()); + DataTestUtil.createKey(bucket2, parent + childFile, CONTENT.array()); } } @@ -320,7 +320,7 @@ public void testSnapshotWithFSO() throws Exception { // Overwrite 3 keys -> Moves previous version to deletedTable for (int i = 11; i <= 13; i++) { - TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array()); + DataTestUtil.createKey(bucket2, "key" + i, CONTENT.array()); } assertTableRowCount(keyTable, 24); @@ -384,7 +384,7 @@ public void testSnapshotWithFSO() throws Exception { // Overwrite 2 keys for (int i = 14; i <= 15; i++) { - TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array()); + DataTestUtil.createKey(bucket2, "key" + i, CONTENT.array()); } // Delete 2 more keys @@ -565,8 +565,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws OmMetadataManagerImpl metadataManager = (OmMetadataManagerImpl) om.getMetadataManager(); - TestDataUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array()); - TestDataUtil.createKey(bucket, bucket.getName() + "key1", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key1", CONTENT.array()); assertTableRowCount(keyTable, 2); // Create Snapshot 1. @@ -576,8 +576,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws // Overwrite bucket1key0, This is a newer version of the key which should // reclaimed as this is a different version of the key. - TestDataUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array()); - TestDataUtil.createKey(bucket, bucket.getName() + "key2", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key2", CONTENT.array()); // Key 1 cannot be reclaimed as it is still referenced by Snapshot 1. client.getProxy().deleteKey(bucket.getVolumeName(), bucket.getName(), @@ -601,8 +601,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws // deletedTable when Snapshot 2 is taken. assertTableRowCount(deletedTable, 0); - TestDataUtil.createKey(bucket, bucket.getName() + "key3", CONTENT.array()); - TestDataUtil.createKey(bucket, bucket.getName() + "key4", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key3", CONTENT.array()); + DataTestUtil.createKey(bucket, bucket.getName() + "key4", CONTENT.array()); client.getProxy().deleteKey(bucket.getVolumeName(), bucket.getName(), bucket.getName() + "key4", false); assertTableRowCount(keyTable, 1); @@ -694,7 +694,7 @@ public void testSnapshotDeletingServiceWaitsForKeyDeletingService(boolean kdsRun UUID snap1Id = client.getObjectStore().getSnapshotInfo(volume, bucket, "snap0").getSnapshotId(); // Create snap1 - TestDataUtil.createKey(ozoneBucket, "key", CONTENT.array()); + DataTestUtil.createKey(ozoneBucket, "key", CONTENT.array()); client.getObjectStore().createSnapshot(volume, bucket, "snap1"); UUID snap2Id = client.getObjectStore().getSnapshotInfo(volume, bucket, "snap1").getSnapshotId(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java index d6115220ff91..40dd14d4469f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java @@ -116,10 +116,10 @@ import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffReportEntry; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -263,7 +263,7 @@ private void init() throws Exception { cluster.waitForClusterToBeReady(); client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - ozoneBucket = TestDataUtil.createVolumeAndBucket(client, bucketLayout, null, createLinkedBucket); + ozoneBucket = DataTestUtil.createVolumeAndBucket(client, bucketLayout, null, createLinkedBucket); if (createLinkedBucket) { this.linkedBuckets.put(ozoneBucket.getName(), ozoneBucket.getSourceBucket()); } @@ -284,7 +284,7 @@ private void createBucket(OzoneVolume volume, String bucketVal) throws IOExcepti if (createLinkedBucket) { String sourceBucketName = linkedBuckets.computeIfAbsent(bucketVal, (k) -> bucketVal + counter.incrementAndGet()); volume.createBucket(sourceBucketName); - TestDataUtil.createLinkedBucket(client, volume.getName(), sourceBucketName, bucketVal); + DataTestUtil.createLinkedBucket(client, volume.getName(), sourceBucketName, bucketVal); this.linkedBuckets.put(bucketVal, sourceBucketName); } else { volume.createBucket(bucketVal); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java index 964513702a08..3d7d27779a00 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java @@ -63,8 +63,8 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdds.client.StandaloneReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -132,7 +132,7 @@ public void setupFsClient() throws IOException { writeClient = objectStore.getClientProxy().getOzoneManagerClient(); ozoneManager = cluster().getOzoneManager(); - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, bucketLayout, null, createLinkedBuckets); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, bucketLayout, null, createLinkedBuckets); if (createLinkedBuckets) { linkedBucketMaps.put(bucket.getName(), bucket.getSourceBucket()); } @@ -320,7 +320,7 @@ private void createKeys(OzoneBucket ozoneBucket, List keys) private void createKey(OzoneBucket ozoneBucket, String key, int length) throws Exception { - byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length); + byte[] input = DataTestUtil.createStringKey(ozoneBucket, key, length); // Read the key with given key name. readkey(ozoneBucket, key, length, input); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java index cd461b7e88a7..05dabc8df8b9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java @@ -43,10 +43,10 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; import org.apache.hadoop.hdds.utils.db.RDBCheckpointUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl; import org.apache.hadoop.ozone.OzoneConfigKeys; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; @@ -90,7 +90,7 @@ public static void staticInit() throws Exception { cluster.waitForClusterToBeReady(); client = cluster.newClient(); store = client.getObjectStore(); - ozoneBucket = TestDataUtil.createVolumeAndBucket(client); + ozoneBucket = DataTestUtil.createVolumeAndBucket(client); volumeName = ozoneBucket.getVolumeName(); bucketName = ozoneBucket.getName(); } @@ -235,7 +235,7 @@ public void testSnapshotChainManagerRestore() throws Exception { // Create 10 buckets and initialize snapshot name lists. for (int i = 0; i < 10; i++) { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client); ozoneBuckets.add(bucket); volumeNames.add(bucket.getVolumeName()); bucketNames.add(bucket.getName()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java index 5e3f49e4f39b..7dd31fdc900a 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotBackgroundServices.java @@ -18,12 +18,12 @@ package org.apache.hadoop.ozone.om.snapshot; import static java.util.stream.Collectors.toSet; +import static org.apache.hadoop.ozone.DataTestUtil.readFully; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_SNAPSHOT_COMPACTION_DAG_MAX_TIME_ALLOWED; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_SNAPSHOT_COMPACTION_DAG_PRUNE_DAEMON_RUN_INTERVAL; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX; -import static org.apache.hadoop.ozone.TestDataUtil.readFully; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPath; import static org.apache.hadoop.ozone.om.TestOzoneManagerHAWithStoppedNodes.createKey; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java index a34e11e6226f..d68d6f990d11 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java @@ -43,9 +43,9 @@ import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffReportEntry; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.om.OMConfigKeys; @@ -98,7 +98,7 @@ public static void init() throws Exception { client = cluster.newClient(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED); volumeName = bucket.getVolumeName(); bucketName = bucket.getName(); @@ -305,7 +305,7 @@ public void testSnapshotDiffBeforeAndAfterDeepCleaning() throws Exception { String volume = "vol-" + counter.incrementAndGet(); String bucket = "buc-" + counter.incrementAndGet(); // create a volume and a bucket to be used by OzoneFileSystem - OzoneBucket volBucket = TestDataUtil.createVolumeAndBucket(client, volume, bucket, + OzoneBucket volBucket = DataTestUtil.createVolumeAndBucket(client, volume, bucket, BucketLayout.FILE_SYSTEM_OPTIMIZED); volBucket.createDirectory("dir1/dir2/dir3/dir4"); cluster.getOzoneManager().getKeyManager().getDirDeletingService().suspend(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneContainerUpgradeShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneContainerUpgradeShell.java index 215e7a565838..9572963311d4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneContainerUpgradeShell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneContainerUpgradeShell.java @@ -50,10 +50,10 @@ import org.apache.hadoop.hdds.utils.db.CodecTestUtil; import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectMetrics; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; @@ -150,8 +150,8 @@ private static ContainerInfo writeKeyAndCloseContainer() throws Exception { } private static void writeKey(String keyName) throws IOException { - OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, VOLUME_NAME, BUCKET_NAME); - TestDataUtil.createKey(bucket, keyName, "test".getBytes(StandardCharsets.UTF_8)); + OzoneBucket bucket = DataTestUtil.createVolumeAndBucket(client, VOLUME_NAME, BUCKET_NAME); + DataTestUtil.createKey(bucket, keyName, "test".getBytes(StandardCharsets.UTF_8)); } private static ContainerInfo closeContainerForKey(String keyName) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugReplicasVerify.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugReplicasVerify.java index 32f7d1aae6a2..70d0ca3e7632 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugReplicasVerify.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugReplicasVerify.java @@ -17,7 +17,7 @@ package org.apache.hadoop.ozone.shell; -import static org.apache.hadoop.ozone.TestDataUtil.createKeys; +import static org.apache.hadoop.ozone.DataTestUtil.createKeys; import static org.apache.hadoop.ozone.container.ContainerTestHelper.corruptFile; import static org.apache.hadoop.ozone.container.ContainerTestHelper.truncateFile; import static org.apache.ozone.test.GenericTestUtils.setLogLevel; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java index 06169069b17d..0207cdd4db49 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java @@ -45,8 +45,8 @@ import org.apache.hadoop.hdds.scm.container.ContainerID; import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.OzoneTestUtils; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneSnapshot; import org.apache.hadoop.ozone.debug.OzoneDebug; @@ -189,9 +189,9 @@ private void writeKey(String volumeName, String bucketName, repConfig = ReplicationConfig.fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.THREE); } - TestDataUtil.createVolumeAndBucket(client, volumeName, bucketName, + DataTestUtil.createVolumeAndBucket(client, volumeName, bucketName, layout); - TestDataUtil.createKey( + DataTestUtil.createKey( client.getObjectStore().getVolume(volumeName).getBucket(bucketName), keyName, repConfig, "test".getBytes(StandardCharsets.UTF_8)); } 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 bc8936bfe36e..c132f96d0a8f 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 @@ -41,8 +41,8 @@ import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.utils.IOUtils; +import org.apache.hadoop.ozone.DataTestUtil; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKeyDetails; @@ -100,7 +100,7 @@ void init(@TempDir Path path) throws Exception { conf.unset(key); } - TestDataUtil.createVolume(client, VOLUME_NAME); + DataTestUtil.createVolume(client, VOLUME_NAME); volume = client.getObjectStore().getVolume(VOLUME_NAME); }