Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13885. Implement getLinkTarget for ViewFileSystem. Contributed by Manoj Govindassamy.

This commit is contained in:
Andrew Wang 2017-01-09 18:01:10 -08:00
parent 603cbcd513
commit 511d39e074
3 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
View File

@ -233,6 +233,11 @@ class ChRootedFileSystem extends FilterFileSystem {
return super.getFileStatus(fullPath(f));
}
@Override
public Path getLinkTarget(Path f) throws IOException {
return super.getLinkTarget(fullPath(f));
}
@Override
public void access(Path path, FsAction mode) throws AccessControlException,
FileNotFoundException, IOException {

11
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
View File

@ -876,6 +876,17 @@ public class ViewFileSystem extends FileSystem {
}
}
@Override
public Path getLinkTarget(Path path) throws IOException {
InodeTree.ResolveResult<FileSystem> res;
try {
res = fsState.resolve(getUriPath(path), true);
} catch (FileNotFoundException e) {
throw new NotInMountpointException(path, "getLinkTarget");
}
return res.targetFileSystem.getLinkTarget(res.remainingPath);
}
/**
* An instance of this class represents an internal dir of the viewFs
* that is internal dir of the mount table.

73
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java
View File

@ -51,6 +51,7 @@ import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.junit.Assume;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.hadoop.fs.FileSystemTestHelper.*;
@ -1137,4 +1138,76 @@ abstract public class ViewFileSystemBaseTest {
"the mounted FileSystem!",
usedSpaceByPathViaTargetFs, usedSpaceByPathViaViewFs);
}
@Test
public void testLinkTarget() throws Exception {
Assume.assumeTrue(fsTarget.supportsSymlinks() &&
fsTarget.areSymlinksEnabled());
// Symbolic link
final String targetFileName = "debug.log";
final String linkFileName = "debug.link";
final Path targetFile = new Path(targetTestRoot, targetFileName);
final Path symLink = new Path(targetTestRoot, linkFileName);
FileSystemTestHelper.createFile(fsTarget, targetFile);
fsTarget.createSymlink(targetFile, symLink, false);
final Path mountTargetRootPath = new Path("/targetRoot");
final Path mountTargetSymLinkPath = new Path(mountTargetRootPath,
linkFileName);
final Path expectedMountLinkTarget = fsTarget.makeQualified(
new Path(targetTestRoot, targetFileName));
final Path actualMountLinkTarget = fsView.getLinkTarget(
mountTargetSymLinkPath);
assertEquals("Resolved link target path not matching!",
expectedMountLinkTarget, actualMountLinkTarget);
// Relative symbolic link
final String relativeFileName = "dir2/../" + targetFileName;
final String link2FileName = "dir2/rel.link";
final Path relTargetFile = new Path(targetTestRoot, relativeFileName);
final Path relativeSymLink = new Path(targetTestRoot, link2FileName);
fsTarget.createSymlink(relTargetFile, relativeSymLink, true);
final Path mountTargetRelativeSymLinkPath = new Path(mountTargetRootPath,
link2FileName);
final Path expectedMountRelLinkTarget = fsTarget.makeQualified(
new Path(targetTestRoot, relativeFileName));
final Path actualMountRelLinkTarget = fsView.getLinkTarget(
mountTargetRelativeSymLinkPath);
assertEquals("Resolved relative link target path not matching!",
expectedMountRelLinkTarget, actualMountRelLinkTarget);
try {
fsView.getLinkTarget(new Path("/linkToAFile"));
fail("Resolving link target for a ViewFs mount link should fail!");
} catch (Exception e) {
LOG.info("Expected exception: " + e);
assertThat(e.getMessage(),
containsString("not a symbolic link"));
}
try {
fsView.getLinkTarget(fsView.makeQualified(
new Path(mountTargetRootPath, targetFileName)));
fail("Resolving link target for a non sym link should fail!");
} catch (Exception e) {
LOG.info("Expected exception: " + e);
assertThat(e.getMessage(),
containsString("not a symbolic link"));
}
try {
fsView.getLinkTarget(new Path("/targetRoot/non-existing-file"));
fail("Resolving link target for a non existing link should fail!");
} catch (Exception e) {
LOG.info("Expected exception: " + e);
assertThat(e.getMessage(),
containsString("File does not exist:"));
}
}
}