Author: jeagles
Date: Wed Oct 16 22:47:16 2013
New Revision: 1532929
URL: http://svn.apache.org/r1532929
Log:
HADOOP-9078. enhance unit-test coverage of class
org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java?rev=1532929&r1=1532928&r2=1532929&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Wed Oct 16 22:47:16 2013
@@ -19,8 +19,10 @@
package org.apache.hadoop.fs;
import static org.apache.hadoop.fs.FileContextTestHelper.exists;
+import static org.junit.Assert.fail;
import java.io.IOException;
+import java.net.URI;
import java.net.URISyntaxException;
import javax.security.auth.login.LoginException;
@@ -55,7 +57,8 @@ public class TestHDFSFileContextMainOper
LoginException, URISyntaxException {
cluster = new MiniDFSCluster.Builder(CONF).numDataNodes(2).build();
cluster.waitClusterUp();
- fc = FileContext.getFileContext(cluster.getURI(0), CONF);
+ URI uri0 = cluster.getURI(0);
+ fc = FileContext.getFileContext(uri0, CONF);
defaultWorkingDirectory = fc.makeQualified( new Path("/user/" +
UserGroupInformation.getCurrentUser().getShortUserName()));
fc.mkdir(defaultWorkingDirectory, FileContext.DEFAULT_PERM, true);
@@ -77,7 +80,10 @@ public class TestHDFSFileContextMainOper
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
- cluster.shutdown();
+ if (cluster != null) {
+ cluster.shutdown();
+ cluster = null;
+ }
}
@Override
@@ -111,7 +117,7 @@ public class TestHDFSFileContextMainOper
@Test
public void testOldRenameWithQuota() throws Exception {
- DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+ DistributedFileSystem fs = cluster.getFileSystem();
Path src1 = getTestRootPath(fc, "test/testOldRenameWithQuota/srcdir/src1");
Path src2 = getTestRootPath(fc, "test/testOldRenameWithQuota/srcdir/src2");
Path dst1 = getTestRootPath(fc, "test/testOldRenameWithQuota/dstdir/dst1");
@@ -146,7 +152,7 @@ public class TestHDFSFileContextMainOper
@Test
public void testRenameWithQuota() throws Exception {
- DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+ DistributedFileSystem fs = cluster.getFileSystem();
Path src1 = getTestRootPath(fc, "test/testRenameWithQuota/srcdir/src1");
Path src2 = getTestRootPath(fc, "test/testRenameWithQuota/srcdir/src2");
Path dst1 = getTestRootPath(fc, "test/testRenameWithQuota/dstdir/dst1");
@@ -210,7 +216,7 @@ public class TestHDFSFileContextMainOper
*/
@Test
public void testEditsLogOldRename() throws Exception {
- DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+ DistributedFileSystem fs = cluster.getFileSystem();
Path src1 = getTestRootPath(fc, "testEditsLogOldRename/srcdir/src1");
Path dst1 = getTestRootPath(fc, "testEditsLogOldRename/dstdir/dst1");
createFile(src1);
@@ -226,7 +232,7 @@ public class TestHDFSFileContextMainOper
// Restart the cluster and ensure the above operations can be
// loaded from the edits log
restartCluster();
- fs = (DistributedFileSystem)cluster.getFileSystem();
+ fs = cluster.getFileSystem();
src1 = getTestRootPath(fc, "testEditsLogOldRename/srcdir/src1");
dst1 = getTestRootPath(fc, "testEditsLogOldRename/dstdir/dst1");
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
@@ -239,7 +245,7 @@ public class TestHDFSFileContextMainOper
*/
@Test
public void testEditsLogRename() throws Exception {
- DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+ DistributedFileSystem fs = cluster.getFileSystem();
Path src1 = getTestRootPath(fc, "testEditsLogRename/srcdir/src1");
Path dst1 = getTestRootPath(fc, "testEditsLogRename/dstdir/dst1");
createFile(src1);
@@ -255,7 +261,7 @@ public class TestHDFSFileContextMainOper
// Restart the cluster and ensure the above operations can be
// loaded from the edits log
restartCluster();
- fs = (DistributedFileSystem)cluster.getFileSystem();
+ fs = cluster.getFileSystem();
src1 = getTestRootPath(fc, "testEditsLogRename/srcdir/src1");
dst1 = getTestRootPath(fc, "testEditsLogRename/dstdir/dst1");
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
@@ -279,7 +285,7 @@ public class TestHDFSFileContextMainOper
private void oldRename(Path src, Path dst, boolean renameSucceeds,
boolean exception) throws Exception {
- DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
+ DistributedFileSystem fs = cluster.getFileSystem();
try {
Assert.assertEquals(renameSucceeds, fs.rename(src, dst));
} catch (Exception ex) {
@@ -301,4 +307,23 @@ public class TestHDFSFileContextMainOper
Assert.assertEquals(renameSucceeds, !exists(fc, src));
Assert.assertEquals((dstExists||renameSucceeds), exists(fc, dst));
}
+
+ @Override
+ protected boolean listCorruptedBlocksSupported() {
+ return true;
+ }
+
+ @Test
+ public void testCrossFileSystemRename() throws IOException {
+ try {
+ fc.rename(
+ new Path("hdfs://127.0.0.1/aaa/bbb/Foo"),
+ new Path("file://aaa/bbb/Moo"),
+ Options.Rename.OVERWRITE);
+ fail("IOexception expected.");
+ } catch (IOException ioe) {
+ // okay
+ }
+ }
+
}
