[
https://issues.apache.org/jira/browse/HADOOP-17428?focusedWorklogId=642531&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-642531
]
ASF GitHub Bot logged work on HADOOP-17428:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 26/Aug/21 18:50
Start Date: 26/Aug/21 18:50
Worklog Time Spent: 10m
Work Description: sumangala-patki commented on a change in pull request
#2549:
URL: https://github.com/apache/hadoop/pull/2549#discussion_r696894597
##########
File path:
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestGetContentSummary.java
##########
@@ -0,0 +1,227 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.fs.azurebfs.services;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
+import org.apache.hadoop.fs.azurebfs.utils.TracingHeaderValidator;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import org.apache.hadoop.fs.ContentSummary;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;
+import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem;
+
+import static
org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.DEFAULT_AZURE_LIST_MAX_RESULTS;
+import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+
+public class TestGetContentSummary extends AbstractAbfsIntegrationTest {
+
+ private static final int TEST_BUFFER_SIZE = 20;
+ private static final int FILES_PER_DIRECTORY = 2;
+ private static final int MAX_THREADS = 16;
+ private static final int NUM_FILES_FOR_LIST_MAX_TEST =
+ DEFAULT_AZURE_LIST_MAX_RESULTS + 10;
+private static final int NUM_CONCURRENT_CALLS = 8;
+
+ private final String[] directories = {"/testFolder",
+ "/testFolderII",
+ "/testFolder/testFolder1",
+ "/testFolder/testFolder2",
+ "/testFolder/testFolder3",
+ "/testFolder/testFolder2/testFolder4",
+ "/testFolder/testFolder2/testFolder5",
+ "/testFolder/testFolder3/testFolder6",
+ "/testFolder/testFolder3/testFolder7"};
+
+ private final byte[] b = new byte[TEST_BUFFER_SIZE];
+
+ public TestGetContentSummary() throws Exception {
+ new Random().nextBytes(b);
+ }
+
+ @Test
+ public void testFilesystemRoot()
+ throws IOException, ExecutionException, InterruptedException {
+ AzureBlobFileSystem fs = getFileSystem();
+ createDirectoryStructure();
+ int fileCount = directories.length * FILES_PER_DIRECTORY;
+ ContentSummary contentSummary = fs.getContentSummary(new Path("/"));
+ verifyContentSummary(contentSummary, directories.length, fileCount,
+ directories.length * TEST_BUFFER_SIZE);
+ }
+
+ @Test
+ public void testFileContentSummary() throws IOException {
+ AzureBlobFileSystem fs = getFileSystem();
+ fs.mkdirs(new Path("/testFolder"));
+ Path filePath = new Path("/testFolder/testFile");
+ fs.create(filePath);
+ FSDataOutputStream out = fs.append(filePath);
+ out.write(b);
+ out.close();
+ ContentSummary contentSummary = fs.getContentSummary(filePath);
+ verifyContentSummary(contentSummary, 0, 1, TEST_BUFFER_SIZE);
+ }
+
+ @Test
+ public void testLeafDir() throws IOException {
+ AzureBlobFileSystem fs = getFileSystem();
+ fs.mkdirs(new Path("/testFolder"));
+ fs.mkdirs(new Path("/testFolder/testFolder1"));
+ fs.mkdirs(new Path("/testFolder/testFolder2"));
+ Path leafDir = new Path("/testFolder/testFolder1/testFolder3");
+ fs.mkdirs(leafDir);
+ ContentSummary contentSummary = fs.getContentSummary(leafDir);
+ verifyContentSummary(contentSummary, 0, 0, 0);
+ }
+
+ @Test
+ public void testIntermediateDirWithFilesOnly()
+ throws IOException, ExecutionException, InterruptedException {
+ AzureBlobFileSystem fs = getFileSystem();
+ fs.mkdirs(new Path("/testFolder"));
+ Path intermediateDir = new Path("/testFolder/testFolder1");
+ fs.mkdirs(intermediateDir);
+ populateDirWithFiles(intermediateDir, FILES_PER_DIRECTORY);
+ ContentSummary contentSummary =
+ fs.getContentSummary(intermediateDir);
+ verifyContentSummary(contentSummary, 0, FILES_PER_DIRECTORY,
+ TEST_BUFFER_SIZE);
+ }
+
+ @Test
+ public void testIntermediateDirWithFilesAndSubdirs()
+ throws IOException, ExecutionException, InterruptedException {
+ AzureBlobFileSystem fs = getFileSystem();
+ fs.mkdirs(new Path("/testFolder"));
+ Path intermediateDir = new Path("/testFolder/testFolder1");
+ fs.mkdirs(intermediateDir);
+ populateDirWithFiles(intermediateDir, FILES_PER_DIRECTORY);
+ fs.mkdirs(new Path("/testFolder/testFolder1/testFolder3"));
+ fs.registerListener(
+ new TracingHeaderValidator(getConfiguration().getClientCorrelationId(),
+ fs.getFileSystemId(), FSOperationType.GET_CONTENT_SUMMARY, true,
+ 0));
+ ContentSummary contentSummary =
+ fs.getContentSummary(intermediateDir);
+ verifyContentSummary(contentSummary, 1, FILES_PER_DIRECTORY,
+ TEST_BUFFER_SIZE);
+ }
+
+ @Test
+ public void testDirOverListMaxResultsItems()
+ throws IOException, ExecutionException, InterruptedException {
+ AzureBlobFileSystem fs = getFileSystem();
+ fs.mkdirs(new Path("/testFolder"));
+ Path pathToListMaxDir = new Path("/testFolder/listMaxDir");
+ fs.mkdirs(pathToListMaxDir);
+ fs.mkdirs(new Path(pathToListMaxDir + "/testFolder2"));
+ populateDirWithFiles(pathToListMaxDir, NUM_FILES_FOR_LIST_MAX_TEST);
+ verifyContentSummary(
+ fs.getContentSummary(pathToListMaxDir), 1,
+ NUM_FILES_FOR_LIST_MAX_TEST, TEST_BUFFER_SIZE);
+ }
+
+ @Test
+ public void testInvalidPath() throws Exception {
+ AzureBlobFileSystem fs = getFileSystem();
+ intercept(IOException.class, () -> fs.getContentSummary(new Path(
+ "/nonExistentPath")));
+ }
+
+ @Test
+ public void testConcurrentGetContentSummaryCalls()
+ throws InterruptedException, ExecutionException, IOException {
+ AzureBlobFileSystem fs = getFileSystem();
+ ExecutorService executorService = new ThreadPoolExecutor(1, MAX_THREADS, 5,
+ TimeUnit.SECONDS, new SynchronousQueue<>());
+ CompletionService<ContentSummary> completionService =
+ new ExecutorCompletionService<>(executorService);
+ createDirectoryStructure();
+ for (int i = 0; i < NUM_CONCURRENT_CALLS; i++) {
+ completionService.submit(() -> fs.getContentSummary(new Path(
+ "/testFolder")));
+ }
+ for (int i = 0; i < NUM_CONCURRENT_CALLS; i++) {
+ ContentSummary contentSummary = completionService.take().get();
+ verifyContentSummary(contentSummary, 7, 8 * FILES_PER_DIRECTORY,
+ 8 * TEST_BUFFER_SIZE);
+ }
+ executorService.shutdown();
+ }
+
+ private void verifyContentSummary(ContentSummary contentSummary,
+ long expectedDirectoryCount, long expectedFileCount, long
expectedByteCount) {
+ Assertions.assertThat(contentSummary.getDirectoryCount())
+ .describedAs("Incorrect directory
count").isEqualTo(expectedDirectoryCount);
+ Assertions.assertThat(contentSummary.getFileCount())
+ .describedAs("Incorrect file count").isEqualTo(expectedFileCount);
+ Assertions.assertThat(contentSummary.getLength())
+ .describedAs("Incorrect length").isEqualTo(expectedByteCount);
+ Assertions.assertThat(contentSummary.getSpaceConsumed())
+ .describedAs("Incorrect value of space
consumed").isEqualTo(expectedByteCount);
+ }
+
+ private void createDirectoryStructure()
+ throws IOException, ExecutionException, InterruptedException {
+ AzureBlobFileSystem fs = getFileSystem();
+ for (String directory : directories) {
+ Path dirPath = new Path(directory);
+ fs.mkdirs(dirPath);
+ populateDirWithFiles(dirPath, FILES_PER_DIRECTORY);
+ }
+ }
+
+ private void populateDirWithFiles(Path directory, int numFiles)
+ throws ExecutionException, InterruptedException, IOException {
+ final List<Future<Void>> tasks = new ArrayList<>();
+ ExecutorService es = Executors.newFixedThreadPool(10);
+ for (int i = 0; i < numFiles; i++) {
+ final Path fileName = new Path(directory + "/test" + i);
Review comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 642531)
Time Spent: 1h 40m (was: 1.5h)
> ABFS: Implementation for getContentSummary
> ------------------------------------------
>
> Key: HADOOP-17428
> URL: https://issues.apache.org/jira/browse/HADOOP-17428
> Project: Hadoop Common
> Issue Type: Sub-task
> Components: fs/azure
> Affects Versions: 3.3.0
> Reporter: Sumangala Patki
> Assignee: Sumangala Patki
> Priority: Major
> Labels: pull-request-available
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> Adds implementation for HDFS method getContentSummary, which takes in a Path
> argument and returns details such as file/directory count and space utilized
> under that path.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
