[
https://issues.apache.org/jira/browse/HDFS-6326?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Chris Nauroth updated HDFS-6326:
--------------------------------
Attachment: HDFS-6326.6.patch
Here is patch v6. I fixed the JavaDoc warning. I also added one more test in
{{FSAclBaseTest}} asserting that {{setPermission}} cannot mess with the ACL
bit. There is no problem related to this in the main code, because it uses
{{FsPermission#toShort}} to serialize the permissions, and we've made sure that
the ACL bit isn't visible through that method. I want this test in place
though to catch regressions in case that implementation detail ever changes.
For convenience, here is the incremental diff since last time, so reviewers
don't need to re-read the whole thing:
{code}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
b/hadoop-common-
index c9fa89d..ee84437 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
@@ -159,7 +159,7 @@ public short toShort() {
}
/**
- * Encodes the object to a short. Unlike {@link toShort()}, this method may
+ * Encodes the object to a short. Unlike {@link #toShort()}, this method may
* return values outside the fixed range 00000 - 01777 if extended features
* are encoded into this permission, such as the ACL bit.
*
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSAclBaseTest.java
b/hadoop-hdf
index 4aeeb85..f36483e 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSAclBaseTest.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSAclBaseTest.java
@@ -38,6 +38,7 @@
import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.protocol.AclException;
+import org.apache.hadoop.hdfs.protocol.FsAclPermission;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.UserGroupInformation;
@@ -815,6 +816,23 @@ public void testSetPermissionOnlyDefault() throws
IOException {
}
@Test
+ public void testSetPermissionCannotSetAclBit() throws IOException {
+ FileSystem.mkdirs(fs, path, FsPermission.createImmutable((short)0750));
+ fs.setPermission(path, FsPermission.createImmutable((short)0700));
+ assertPermission((short)0700);
+ fs.setPermission(path,
+ new FsAclPermission(FsPermission.createImmutable((short)0755)));
+ INode inode = cluster.getNamesystem().getFSDirectory().getNode(
+ path.toUri().getPath(), false);
+ assertNotNull(inode);
+ FsPermission perm = inode.getFsPermission();
+ assertNotNull(perm);
+ assertEquals(0755, perm.toShort());
+ assertEquals(0755, perm.toExtendedShort());
+ assertAclFeature(false);
+ }
+
+ @Test
public void testDefaultAclNewFile() throws Exception {
FileSystem.mkdirs(fs, path, FsPermission.createImmutable((short)0750));
List<AclEntry> aclSpec = Lists.newArrayList(
{code}
> WebHdfs ACL compatibility is broken
> -----------------------------------
>
> Key: HDFS-6326
> URL: https://issues.apache.org/jira/browse/HDFS-6326
> Project: Hadoop HDFS
> Issue Type: Bug
> Components: webhdfs
> Affects Versions: 3.0.0, 2.4.0
> Reporter: Daryn Sharp
> Assignee: Chris Nauroth
> Priority: Blocker
> Attachments: HDFS-6326.1.patch, HDFS-6326.2.patch, HDFS-6326.3.patch,
> HDFS-6326.4.patch, HDFS-6326.5.patch, HDFS-6326.6.patch, aclfsperm.example
>
>
> 2.4 ACL support is completely incompatible with <2.4 webhdfs servers. The NN
> throws an {{IllegalArgumentException}} exception.
> {code}
> hadoop fs -ls webhdfs://nn/
> Found 21 items
> ls: Invalid value for webhdfs parameter "op": No enum constant
> org.apache.hadoop.hdfs.web.resources.GetOpParam.Op.GETACLSTATUS
> [... 20 more times...]
> {code}
--
This message was sent by Atlassian JIRA
(v6.2#6252)
