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

HDFS-15515: mkdirs on fallback should throw IOE out instead of suppressing and returning false (#2205) 

* HDFS-15515: mkdirs on fallback should throw IOE out instead of suppressing and returning false

* Used LambdaTestUtils#intercept in test

(cherry picked from commit 99b120a06e)
This commit is contained in:
Uma Maheswara Rao G 2020-08-11 00:01:58 -07:00
parent 0f234667dd
commit 0808cb6355
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1382,7 +1382,7 @@ public class ViewFileSystem extends FileSystem {
@Override @Override
public boolean mkdirs(Path dir, FsPermission permission) public boolean mkdirs(Path dir, FsPermission permission)
throws AccessControlException, FileAlreadyExistsException { throws IOException {
if (theInternalDir.isRoot() && dir == null) { if (theInternalDir.isRoot() && dir == null) {
throw new FileAlreadyExistsException("/ already exits"); throw new FileAlreadyExistsException("/ already exits");
} }
@ -1412,7 +1412,7 @@ public class ViewFileSystem extends FileSystem {
.append(linkedFallbackFs.getUri()); .append(linkedFallbackFs.getUri());
LOG.debug(msg.toString(), e); LOG.debug(msg.toString(), e);
} }
return false; throw e;
} }
} }
@ -1420,8 +1420,7 @@ public class ViewFileSystem extends FileSystem {
} }
@Override @Override
public boolean mkdirs(Path dir) public boolean mkdirs(Path dir) throws IOException {
throws AccessControlException, FileAlreadyExistsException {
return mkdirs(dir, null); return mkdirs(dir, null);
} }

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemLinkFallback.java
View File

@ -17,6 +17,7 @@
*/ */
package org.apache.hadoop.fs.viewfs; package org.apache.hadoop.fs.viewfs;
import static org.apache.hadoop.test.LambdaTestUtils.intercept;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -759,7 +760,9 @@ public class TestViewFileSystemLinkFallback extends ViewFileSystemBaseTest {
cluster.shutdownNameNodes(); // Stopping fallback server cluster.shutdownNameNodes(); // Stopping fallback server
// /user1/test1 does not exist in mount internal dir tree, it would // /user1/test1 does not exist in mount internal dir tree, it would
// attempt to create in fallback. // attempt to create in fallback.
assertFalse(vfs.mkdirs(nextLevelToInternalDir)); intercept(IOException.class, () -> {
vfs.mkdirs(nextLevelToInternalDir);
});
cluster.restartNameNodes(); cluster.restartNameNodes();
// should return true succeed when fallback fs is back to normal. // should return true succeed when fallback fs is back to normal.
assertTrue(vfs.mkdirs(nextLevelToInternalDir)); assertTrue(vfs.mkdirs(nextLevelToInternalDir));