Skip to content

HDFS-15532: listFiles on root/InternalDir will fail if fallback root has file. #2298

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
umamaheswararao merged 3 commits into from
Sep 13, 2020
Merged

HDFS-15532: listFiles on root/InternalDir will fail if fallback root has file. #2298

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af0b261
HDFS-15532: listFiles on root/InternalDir will fail if fallback root …
umagangumalla Sep 11, 2020
cdd0932
Fixed a checkstyle warning.
umagangumalla Sep 11, 2020
271b8b5
Fixed a review comment and also fixed the issue for ViewFs flow as well
umagangumalla Sep 12, 2020
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
20 changes: 20 additions & 0 deletions ...ommon-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,26 @@ public boolean delete(final Path f)
public BlockLocation[] getFileBlockLocations(final FileStatus fs,
final long start, final long len) throws
FileNotFoundException, IOException {

// When application calls listFiles on internalDir, it would return
// RemoteIterator from InternalDirOfViewFs. If there is a fallBack, there
// is a chance of files exists under that internalDir in fallback.
// Iterator#next will call getFileBlockLocations with that files. So, we
// should return getFileBlockLocations on fallback. See HDFS-15532.
if (fs.getPath() != InodeTree.SlashPath && this.fsState
.getRootFallbackLink() != null) {
FileSystem linkedFallbackFs =
this.fsState.getRootFallbackLink().getTargetFileSystem();
Path parent = Path.getPathWithoutSchemeAndAuthority(
new Path(theInternalDir.fullPath));
String leafChild = (InodeTree.SlashPath.equals(fs.getPath())) ?
InodeTree.SlashPath.toString() :
fs.getPath().getName();
Copy link
Member

@ayushtkn ayushtkn Sep 12, 2020

Choose a reason for hiding this comment

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

(InodeTree.SlashPath.equals(fs.getPath()))
In which case this would be true? Provided there is a check in the if condition

Copy link
Contributor Author

@umamaheswararao umamaheswararao Sep 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks @ayushtkn for review! I have removed this redundant condition.
I realized that, this bug exist in ViewFs as well. I fixed and added a test case for it. Thanks

Path pathToFallbackFs = new Path(parent, leafChild);
return linkedFallbackFs
.getFileBlockLocations(pathToFallbackFs, start, len);
}

checkPathIsSlash(fs.getPath());
throw new FileNotFoundException("Path points to dir not a file");
}
Expand Down
6 changes: 0 additions & 6 deletions ...doop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestViewDistributedFileSystemContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;

import java.io.File;
Expand Down Expand Up @@ -86,9 +85,4 @@ public void testRenameRootDirForbidden() throws Exception {
super.testRenameRootDirForbidden();
});
}

@Ignore("Ignore this test until HDFS-15532")
@Override
public void testLSRootDir() throws Throwable {
}
}