Skip to content

HDDS-12525. Replace TestHelper#createKey with TestDataUtil#createKey #8233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 5 commits into from
Apr 6, 2025
Merged

HDDS-12525. Replace TestHelper#createKey with TestDataUtil#createKey #8233

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93098bb
HDDS-12525. Replace TestHelper#createKey with TestDataUtil#createKey
chiacyu Apr 5, 2025
e1f774c
Fixed styles
chiacyu Apr 5, 2025
1d2e401
Refactor the testHelp.createkey()
chiacyu Apr 6, 2025
86231bc
Fixed styles
chiacyu Apr 6, 2025
c5068c8
Revert "Refactor the testHelp.createkey()"
adoroszlai Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,16 @@
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.IOUtils;
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;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.service.KeyDeletingService;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -108,11 +105,7 @@ public void testKeysPurgingByKeyDeletingService() throws Exception {
for (int i = 1; i <= NUM_KEYS; i++) {
String keyName = keyBase + "-" + i;
keys.add(keyName);
OzoneOutputStream keyStream = TestHelper.createKey(
keyName, ReplicationType.RATIS, ReplicationFactor.ONE,
KEY_SIZE, store, volumeName, bucketName);
keyStream.write(data);
keyStream.close();
TestDataUtil.createKey(bucket, keyName, data);
}

// Delete created keys
Expand Down
12 changes: 3 additions & 9 deletions ...ne/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,12 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
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.io.OzoneOutputStream;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PrepareStatusResponse.PrepareStatus;
Expand Down Expand Up @@ -391,11 +388,8 @@ private void writeTestData(String volumeName,
String keyString = UUID.randomUUID().toString();
byte[] data = ContainerTestHelper.getFixedLengthString(
keyString, 100).getBytes(UTF_8);
OzoneOutputStream keyStream = TestHelper.createKey(
keyName, ReplicationType.RATIS, ReplicationFactor.ONE,
100, store, volumeName, bucketName);
keyStream.write(data);
keyStream.close();
TestDataUtil.createKey(store.getVolume(volumeName).
getBucket(bucketName), keyName, data);
}

private void assertKeysWritten(String volumeName,
Expand Down
14 changes: 4 additions & 10 deletions ...ration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@

import java.util.UUID;
import javax.ws.rs.core.Response;
import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
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.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.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.recon.api.NSSummaryEndpoint;
import org.apache.hadoop.ozone.recon.api.types.EntityType;
Expand Down Expand Up @@ -67,7 +64,7 @@ public static void init() throws Exception {
OMConfigKeys.OZONE_BUCKET_LAYOUT_FILE_SYSTEM_OPTIMIZED);
cluster =
MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(1)
.setNumDatanodes(3)
.includeRecon(true)
.build();
cluster.waitForClusterToBeReady();
Expand All @@ -92,11 +89,8 @@ private void writeTestData(String volumeName,
String keyString = UUID.randomUUID().toString();
byte[] data = ContainerTestHelper.getFixedLengthString(
keyString, 100).getBytes(UTF_8);
OzoneOutputStream keyStream = TestHelper.createKey(
keyName, ReplicationType.RATIS, ReplicationFactor.ONE,
100, store, volumeName, bucketName);
keyStream.write(data);
keyStream.close();
TestDataUtil.createKey(store.getVolume(volumeName).
getBucket(bucketName), keyName, data);
Copy link
Contributor

@adoroszlai adoroszlai Apr 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please inline writeTestData, i.e. move these few lines into writeKeys. Then we can avoid looking up volume again.

Copy link
Contributor Author

@chiacyu chiacyu Apr 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering are we going to replace the all occurrence of TestHelper.createKey? Some tests would assert the later behavior and value change in the attribute of KeyOutputStream when the write() is trigger.

Copy link
Contributor

@adoroszlai adoroszlai Apr 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, those tests need createKey that returns OutputStream.

Copy link
Contributor Author

@chiacyu chiacyu Apr 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks for the reminder.

}

private void writeKeys(String vol, String bucket, String key)
Expand Down