HADOOP-7327. FileSystem.listStatus() throws NullPointerException instead of IOException upon access permission failure. Contributed by Matt Foley.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1143491 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
99f0b7d8cd
commit
ff0511019c
|
@ -246,6 +246,9 @@ Trunk (unreleased changes)
|
|||
|
||||
BUG FIXES
|
||||
|
||||
HADOOP-7327. FileSystem.listStatus() throws NullPointerException instead of
|
||||
IOException upon access permission failure. (mattf)
|
||||
|
||||
HADOOP-7015. RawLocalFileSystem#listStatus does not deal with a directory
|
||||
whose entries are changing (e.g. in a multi-thread or multi-process
|
||||
environment). (Sanjay Radia via eli)
|
||||
|
|
|
@ -1151,6 +1151,9 @@ public abstract class FileSystem extends Configured implements Closeable {
|
|||
private void listStatus(ArrayList<FileStatus> results, Path f,
|
||||
PathFilter filter) throws FileNotFoundException, IOException {
|
||||
FileStatus listing[] = listStatus(f);
|
||||
if (listing == null) {
|
||||
throw new IOException("Error accessing " + f);
|
||||
}
|
||||
|
||||
for (int i = 0; i < listing.length; i++) {
|
||||
if (filter.accept(listing[i].getPath())) {
|
||||
|
|
|
@ -25,6 +25,7 @@ import java.io.InputStream;
|
|||
|
||||
|
||||
import org.apache.hadoop.fs.Options.Rename;
|
||||
import org.apache.hadoop.fs.permission.FsPermission;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
|
@ -252,6 +253,7 @@ public abstract class FSMainOperationsBaseTest {
|
|||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testListStatusThrowsExceptionForNonExistentFile()
|
||||
throws Exception {
|
||||
try {
|
||||
|
@ -262,6 +264,27 @@ public abstract class FSMainOperationsBaseTest {
|
|||
}
|
||||
}
|
||||
|
||||
// TODO: update after fixing HADOOP-7352
|
||||
@Test
|
||||
public void testListStatusThrowsExceptionForUnreadableDir()
|
||||
throws Exception {
|
||||
Path testRootDir = getTestRootPath(fSys, "test/hadoop/dir");
|
||||
Path obscuredDir = new Path(testRootDir, "foo");
|
||||
Path subDir = new Path(obscuredDir, "bar"); //so foo is non-empty
|
||||
fSys.mkdirs(subDir);
|
||||
fSys.setPermission(obscuredDir, new FsPermission((short)0)); //no access
|
||||
try {
|
||||
fSys.listStatus(obscuredDir);
|
||||
Assert.fail("Should throw IOException");
|
||||
} catch (IOException ioe) {
|
||||
// expected
|
||||
} finally {
|
||||
// make sure the test directory can be deleted
|
||||
fSys.setPermission(obscuredDir, new FsPermission((short)0755)); //default
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testListStatus() throws Exception {
|
||||
Path[] testDirs = {
|
||||
|
@ -315,6 +338,7 @@ public abstract class FSMainOperationsBaseTest {
|
|||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testListStatusFilterWithSomeMatches() throws Exception {
|
||||
Path[] testDirs = {
|
||||
getTestRootPath(fSys, TEST_DIR_AAA),
|
||||
|
@ -919,12 +943,13 @@ public abstract class FSMainOperationsBaseTest {
|
|||
|
||||
@Test
|
||||
public void testRenameDirectoryAsNonExistentDirectory() throws Exception {
|
||||
testRenameDirectoryAsNonExistentDirectory(Rename.NONE);
|
||||
doTestRenameDirectoryAsNonExistentDirectory(Rename.NONE);
|
||||
tearDown();
|
||||
testRenameDirectoryAsNonExistentDirectory(Rename.OVERWRITE);
|
||||
doTestRenameDirectoryAsNonExistentDirectory(Rename.OVERWRITE);
|
||||
}
|
||||
|
||||
private void testRenameDirectoryAsNonExistentDirectory(Rename... options) throws Exception {
|
||||
private void doTestRenameDirectoryAsNonExistentDirectory(Rename... options)
|
||||
throws Exception {
|
||||
if (!renameSupported()) return;
|
||||
|
||||
Path src = getTestRootPath(fSys, "test/hadoop/dir");
|
||||
|
|
Loading…
Reference in New Issue