You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2011/09/28 05:37:31 UTC
svn commit: r1176702 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/test/org/apache/hadoop/hdfs/TestDFSPermission.java
Author: todd
Date: Wed Sep 28 03:37:31 2011
New Revision: 1176702
URL: http://svn.apache.org/viewvc?rev=1176702&view=rev
Log:
HDFS-2332. Add test for HADOOP-7629 (using an immutable FsPermission object as an RPC parameter fails). Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1176702&r1=1176701&r2=1176702&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Sep 28 03:37:31 2011
@@ -32,6 +32,9 @@ Release 0.20.206.0 - unreleased
MAPREDUCE-2836. Provide option to fail jobs when submitted to
non-existent fair scheduler pools. (Ahmed Radwan via todd)
+ HDFS-2332. Add test for HADOOP-7629 (using an immutable FsPermission
+ object as an RPC parameter fails). (todd)
+
Release 0.20.205.0 - unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java?rev=1176702&r1=1176701&r2=1176702&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java Wed Sep 28 03:37:31 2011
@@ -75,6 +75,7 @@ public class TestDFSPermission extends T
final private static Path NON_EXISTENT_FILE = new Path("/NonExistentFile");
private FileSystem fs;
+ private MiniDFSCluster cluster;
private static Random r;
static {
@@ -108,21 +109,26 @@ public class TestDFSPermission extends T
}
}
+ @Override
+ public void setUp() throws IOException {
+ cluster = new MiniDFSCluster(conf, 3, true, null);
+ cluster.waitActive();
+ }
+
+ @Override
+ public void tearDown() throws IOException {
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ }
+
/** This tests if permission setting in create, mkdir, and
* setPermission works correctly
*/
public void testPermissionSetting() throws Exception {
- MiniDFSCluster cluster = new MiniDFSCluster(conf, 3, true, null);
- try {
- cluster.waitActive();
- fs = FileSystem.get(conf);
- LOG.info("ROOT=" + fs.getFileStatus(new Path("/")));
- testPermissionSetting(OpType.CREATE); // test file creation
- testPermissionSetting(OpType.MKDIRS); // test directory creation
- } finally {
- fs.close();
- cluster.shutdown();
- }
+ fs = FileSystem.get(conf);
+ testPermissionSetting(OpType.CREATE); // test file creation
+ testPermissionSetting(OpType.MKDIRS); // test directory creation
}
/* check permission setting works correctly for file or directory */
@@ -226,17 +232,22 @@ public class TestDFSPermission extends T
}
}
+ /**
+ * check that ImmutableFsPermission can be used as the argument
+ * to setPermission
+ */
+ public void testImmutableFsPermission() throws IOException {
+ fs = FileSystem.get(conf);
+
+ // set the permission of the root to be world-wide rwx
+ fs.setPermission(new Path("/"),
+ FsPermission.createImmutable((short)0777));
+ }
+
/* check if the ownership of a file/directory is set correctly */
public void testOwnership() throws Exception {
- MiniDFSCluster cluster = new MiniDFSCluster(conf, 3, true, null);
- try {
- cluster.waitActive();
- testOwnership(OpType.CREATE); // test file creation
- testOwnership(OpType.MKDIRS); // test directory creation
- } finally {
- fs.close();
- cluster.shutdown();
- }
+ testOwnership(OpType.CREATE); // test file creation
+ testOwnership(OpType.MKDIRS); // test directory creation
}
/* change a file/directory's owner and group.
@@ -323,9 +334,7 @@ public class TestDFSPermission extends T
/* Check if namenode performs permission checking correctly for
* superuser, file owner, group owner, and other users */
public void testPermissionChecking() throws Exception {
- MiniDFSCluster cluster = new MiniDFSCluster(conf, 3, true, null);
try {
- cluster.waitActive();
fs = FileSystem.get(conf);
// set the permission of the root to be world-wide rwx
@@ -382,7 +391,6 @@ public class TestDFSPermission extends T
parentPermissions, permissions, parentPaths, filePaths, dirPaths);
} finally {
fs.close();
- cluster.shutdown();
}
}