big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18826. [ABFS] Fix for GetFileStatus("/") failure. (#5909)

Browse Source 
Contributed by Anmol Asrani
This commit is contained in:
Anuj Modi 2023-08-08 11:00:02 -07:00 committed by GitHub
parent b1ed23654c
commit ba32ea70fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
View File

@ -1661,7 +1661,12 @@ private String getOctalNotation(FsPermission fsPermission) {
private String getRelativePath(final Path path) { private String getRelativePath(final Path path) {
Preconditions.checkNotNull(path, "path"); Preconditions.checkNotNull(path, "path");
return path.toUri().getPath(); String relPath = path.toUri().getPath();
if (relPath.isEmpty()) {
// This means that path passed by user is absolute path of root without "/" at end.
relPath = ROOT_PATH;
}
return relPath;
} }
private long parseContentLength(final String contentLength) { private long parseContentLength(final String contentLength) {

22
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemFileStatus.java
View File

@ -18,7 +18,9 @@
package org.apache.hadoop.fs.azurebfs; package org.apache.hadoop.fs.azurebfs;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.junit.Test; import org.junit.Test;
@ -83,9 +85,11 @@ private FileStatus validateStatus(final AzureBlobFileSystem fs, final Path name,
if (isDir) { if (isDir) {
assertEquals(errorInStatus + ": permission", assertEquals(errorInStatus + ": permission",
new FsPermission(DEFAULT_DIR_PERMISSION_VALUE), fileStatus.getPermission()); new FsPermission(DEFAULT_DIR_PERMISSION_VALUE), fileStatus.getPermission());
assertTrue(errorInStatus + "not a directory", fileStatus.isDirectory());
} else { } else {
assertEquals(errorInStatus + ": permission", assertEquals(errorInStatus + ": permission",
new FsPermission(DEFAULT_FILE_PERMISSION_VALUE), fileStatus.getPermission()); new FsPermission(DEFAULT_FILE_PERMISSION_VALUE), fileStatus.getPermission());
assertTrue(errorInStatus + "not a file", fileStatus.isFile());
} }
} }
@ -144,4 +148,22 @@ public void testLastModifiedTime() throws IOException {
assertTrue("lastModifiedTime should be before createEndTime", assertTrue("lastModifiedTime should be before createEndTime",
createEndTime > lastModifiedTime); createEndTime > lastModifiedTime);
} }
@Test
public void testFileStatusOnRoot() throws IOException {
AzureBlobFileSystem fs = getFileSystem();
// Assert that passing relative root path works
Path testPath = new Path("/");
validateStatus(fs, testPath, true);
// Assert that passing absolute root path works
String testPathStr = makeQualified(testPath).toString();
validateStatus(fs, new Path(testPathStr), true);
// Assert that passing absolute root path without "/" works
testPathStr = testPathStr.substring(0, testPathStr.length() - 1);
validateStatus(fs, new Path(testPathStr), true);
}
} }