HDFS-4626. ClientProtocol#getLinkTarget should throw an exception for non-symlink and non-existent paths. (Andrew Wang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493980 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
5d1b453b85
commit
52ebd9c389
@ -382,6 +382,9 @@ Release 2.1.0-beta - UNRELEASED
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
||||
HDFS-4626. ClientProtocol#getLinkTarget should throw an exception for
|
||||
non-symlink and non-existent paths. (Andrew Wang via cmccabe)
|
||||
|
||||
HDFS-4470. Several HDFS tests attempt file operations on invalid HDFS
|
||||
paths when running on Windows. (Chris Nauroth via suresh)
|
||||
|
@ -889,19 +889,21 @@ public void createSymlink(String target, String link, FsPermission dirPerms,
|
||||
@Override // ClientProtocol
|
||||
public String getLinkTarget(String path) throws IOException {
|
||||
metrics.incrGetLinkTargetOps();
|
||||
HdfsFileStatus stat = null;
|
||||
try {
|
||||
HdfsFileStatus stat = namesystem.getFileInfo(path, false);
|
||||
if (stat != null) {
|
||||
// NB: getSymlink throws IOException if !stat.isSymlink()
|
||||
return stat.getSymlink();
|
||||
}
|
||||
stat = namesystem.getFileInfo(path, false);
|
||||
} catch (UnresolvedPathException e) {
|
||||
return e.getResolvedPath().toString();
|
||||
} catch (UnresolvedLinkException e) {
|
||||
// The NameNode should only throw an UnresolvedPathException
|
||||
throw new AssertionError("UnresolvedLinkException thrown");
|
||||
}
|
||||
return null;
|
||||
if (stat == null) {
|
||||
throw new FileNotFoundException("File does not exist: " + path);
|
||||
} else if (!stat.isSymlink()) {
|
||||
throw new IOException("Path " + path + " is not a symbolic link");
|
||||
}
|
||||
return stat.getSymlink();
|
||||
}
|
||||
|
||||
|
||||
|
@ -18,11 +18,16 @@
|
||||
|
||||
package org.apache.hadoop.fs;
|
||||
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.hdfs.DFSClient;
|
||||
import org.apache.hadoop.hdfs.DFSConfigKeys;
|
||||
import org.apache.hadoop.hdfs.DFSTestUtil;
|
||||
import org.apache.hadoop.hdfs.HdfsConfiguration;
|
||||
@ -31,6 +36,7 @@
|
||||
import org.apache.hadoop.security.UserGroupInformation;
|
||||
import org.apache.hadoop.security.token.Token;
|
||||
import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier;
|
||||
import org.apache.hadoop.test.GenericTestUtils;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Assert;
|
||||
import org.junit.BeforeClass;
|
||||
@ -122,4 +128,48 @@ public void testFcDelegationToken() throws UnsupportedFileSystemException,
|
||||
((Hdfs) afs).cancelDelegationToken(
|
||||
(Token<? extends AbstractDelegationTokenIdentifier>) tokenList.get(0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies that attempting to resolve a non-symlink results in client
|
||||
* exception
|
||||
*/
|
||||
@Test
|
||||
public void testLinkTargetNonSymlink() throws UnsupportedFileSystemException,
|
||||
IOException {
|
||||
FileContext fc = null;
|
||||
Path notSymlink = new Path("/notasymlink");
|
||||
try {
|
||||
fc = FileContext.getFileContext(cluster.getFileSystem().getUri());
|
||||
fc.create(notSymlink, EnumSet.of(CreateFlag.CREATE));
|
||||
DFSClient client = new DFSClient(cluster.getFileSystem().getUri(),
|
||||
cluster.getConfiguration(0));
|
||||
try {
|
||||
client.getLinkTarget(notSymlink.toString());
|
||||
fail("Expected exception for resolving non-symlink");
|
||||
} catch (IOException e) {
|
||||
GenericTestUtils.assertExceptionContains("is not a symbolic link", e);
|
||||
}
|
||||
} finally {
|
||||
if (fc != null) {
|
||||
fc.delete(notSymlink, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that attempting to resolve a non-existent-file
|
||||
*/
|
||||
@Test
|
||||
public void testLinkTargetNonExistent() throws IOException {
|
||||
Path doesNotExist = new Path("/filethatdoesnotexist");
|
||||
DFSClient client = new DFSClient(cluster.getFileSystem().getUri(),
|
||||
cluster.getConfiguration(0));
|
||||
try {
|
||||
client.getLinkTarget(doesNotExist.toString());
|
||||
fail("Expected exception for resolving non-existent file");
|
||||
} catch (FileNotFoundException e) {
|
||||
GenericTestUtils.assertExceptionContains("File does not exist: "
|
||||
+ doesNotExist.toString(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user