HDDS-12315. Speed up some Freon integration tests #7870
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,148 +17,110 @@ | |
|
|
||
| package org.apache.hadoop.ozone.freon; | ||
|
|
||
| import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME; | ||
| import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
| import org.apache.hadoop.fs.FileStatus; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.fs.ozone.OzoneFileSystemTests; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.hdds.conf.StorageSize; | ||
| import org.apache.hadoop.hdds.conf.StorageUnit; | ||
| import org.apache.hadoop.hdds.utils.IOUtils; | ||
| import org.apache.hadoop.ozone.client.BucketArgs; | ||
| 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.om.helpers.BucketLayout; | ||
| import org.apache.ozone.test.NonHATests; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.EnumSource; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Test for HadoopDirTreeGenerator. | ||
| */ | ||
| public abstract class TestHadoopDirTreeGenerator implements NonHATests.TestCase { | ||
|
|
||
| private static final int PAGE_SIZE = 10; | ||
|
|
||
| private ObjectStore store = null; | ||
| private static final Logger LOG = | ||
| LoggerFactory.getLogger(TestHadoopDirTreeGenerator.class); | ||
| private OzoneClient client; | ||
|
|
||
| @BeforeEach | ||
| void setup() throws Exception { | ||
| client = cluster().newClient(); | ||
| store = client.getObjectStore(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| void cleanup() { | ||
| IOUtils.closeQuietly(client); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @EnumSource(names = {"FILE_SYSTEM_OPTIMIZED", "LEGACY"}) | ||
| public void testNestedDirTreeGeneration(BucketLayout layout) throws Exception { | ||
| String uuid = UUID.randomUUID().toString(); | ||
| verifyDirTree("vol1-" + uuid, "bucket1", 1, 1, 1, "0", layout); | ||
| verifyDirTree("vol2-" + uuid, "bucket1", 1, 5, 1, "5B", layout); | ||
| verifyDirTree("vol3-" + uuid, "bucket1", 2, 5, 3, "1B", layout); | ||
| verifyDirTree("vol4-" + uuid, "bucket1", 3, 2, 4, "2B", layout); | ||
| verifyDirTree("vol5-" + uuid, "bucket1", 5, 4, 1, "0", layout); | ||
| verifyDirTree("vol6-" + uuid, "bucket1", 2, 1, PAGE_SIZE + PAGE_SIZE / 2, "0", layout); | ||
| } | ||
|
|
||
| private void verifyDirTree(String volumeName, String bucketName, int depth, | ||
| int span, int fileCount, String perFileSize, BucketLayout layout) | ||
| throws IOException { | ||
|
|
||
| store.createVolume(volumeName); | ||
| OzoneVolume volume = store.getVolume(volumeName); | ||
| volume.createBucket(bucketName, BucketArgs.newBuilder().setBucketLayout(layout).build()); | ||
| String rootPath = OZONE_URI_SCHEME + "://" + bucketName + "." + volumeName; | ||
| String om = cluster().getConf().get(OZONE_OM_ADDRESS_KEY); | ||
| new Freon().getCmd().execute( | ||
| "-D", OZONE_OM_ADDRESS_KEY + "=" + om, | ||
| "dtsg", | ||
| "-c", String.valueOf(fileCount), | ||
| "-d", String.valueOf(depth), | ||
| "-g", perFileSize, | ||
| "-n", "1", | ||
| "-r", rootPath, | ||
| "-s", String.valueOf(span) | ||
| ); | ||
| // verify the directory structure | ||
| LOG.info("Started verifying the directory structure..."); | ||
| OzoneConfiguration conf = new OzoneConfiguration(cluster().getConf()); | ||
| OzoneFileSystemTests.setPageSize(conf, PAGE_SIZE); | ||
| try (FileSystem fileSystem = FileSystem.get(URI.create(rootPath), conf)) { | ||
| Path rootDir = new Path(rootPath.concat("/")); | ||
| // verify root path details | ||
| FileStatus[] fileStatuses = fileSystem.listStatus(rootDir); | ||
| // verify the num of peer directories, expected span count is 1 | ||
| // as it has only one dir at root. | ||
| verifyActualSpan(1, Arrays.asList(fileStatuses)); | ||
| for (FileStatus fileStatus : fileStatuses) { | ||
| int actualDepth = | ||
| traverseToLeaf(fileSystem, fileStatus.getPath(), 1, depth, span, | ||
| fileCount, StorageSize.parse(perFileSize, StorageUnit.BYTES)); | ||
| assertEquals(depth, actualDepth, "Mismatch depth in a path"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we rename this class to something like OzoneFileSystemTestUtils? Right now it feels like it is a test case rather than collection of utils.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is lot of duplication between
AbstractOzoneFileSystemTestandAbstractRootedOzoneFileSystemTest. This class is intended as a place where we would move those common test cases, not as a utility. So far onlylistStatusIteratorOnPageSizewas moved in HDDS-9328.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for clarification!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created HDDS-12355.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add TODO with Jira link?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We use Jira for tasks, not TODO items in the code. If someone reports a bug or an improvement idea, we don't go and edit code just to mention those.
Also, the item we discussed is not related to the changes being done in the PR, which touches this class only superficially. If I was working on a series of tasks, it would be OK to mention a follow-up task in a comment to help remember items or details about the follow-up.