From 4e6ff8c78b5de5b8b492eb288409f2eb668d07fb Mon Sep 17 00:00:00 2001 From: Arun Suresh Date: Thu, 9 Apr 2015 12:28:44 -0700 Subject: [PATCH] HDFS-8091: ACLStatus and XAttributes should be presented to INodeAttributesProvider before returning to client (asuresh) (cherry picked from commit 922b7ed21d1f1460263ca42f709bb9f415d189c5) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++ .../hdfs/server/namenode/AclStorage.java | 11 ++++++ .../hdfs/server/namenode/FSDirAclOp.java | 3 +- .../hdfs/server/namenode/FSDirXAttrOp.java | 3 +- .../hdfs/server/namenode/XAttrStorage.java | 6 ++-- .../namenode/TestINodeAttributeProvider.java | 36 +++++++++++++++---- 6 files changed, 50 insertions(+), 12 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b1c53bc4a5b..2098f401255 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -59,6 +59,9 @@ Release 2.7.1 - UNRELEASED HDFS-8269. getBlockLocations() does not resolve the .reserved path and generates incorrect edit logs when updating the atime. (wheat9) + HDFS-8091: ACLStatus and XAttributes should be presented to + INodeAttributesProvider before returning to client (asuresh) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclStorage.java index 4f6ce3ad4ad..abd375594f6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AclStorage.java @@ -162,6 +162,17 @@ public final class AclStorage { return getEntriesFromAclFeature(f); } + /** + * Reads the existing extended ACL entries of an INodeAttribute object. + * + * @param inodeAttr INode to read + * @return List containing extended inode ACL entries + */ + public static List readINodeAcl(INodeAttributes inodeAttr) { + AclFeature f = inodeAttr.getAclFeature(); + return getEntriesFromAclFeature(f); + } + /** * Build list of AclEntries from the AclFeature * @param aclFeature AclFeature diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java index dff1c2e337d..0c572b54cb7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java @@ -172,7 +172,8 @@ class FSDirAclOp { } INode inode = FSDirectory.resolveLastINode(iip); int snapshotId = iip.getPathSnapshotId(); - List acl = AclStorage.readINodeAcl(inode, snapshotId); + List acl = AclStorage.readINodeAcl(fsd.getAttributes(src, + inode.getLocalNameBytes(), inode, snapshotId)); FsPermission fsPermission = inode.getFsPermission(snapshotId); return new AclStatus.Builder() .owner(inode.getUserName()).group(inode.getGroupName()) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java index 45e63f2effe..11811186fa5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java @@ -450,7 +450,8 @@ class FSDirXAttrOp { INodesInPath iip = fsd.getINodesInPath(srcs, true); INode inode = FSDirectory.resolveLastINode(iip); int snapshotId = iip.getPathSnapshotId(); - return XAttrStorage.readINodeXAttrs(inode, snapshotId); + return XAttrStorage.readINodeXAttrs(fsd.getAttributes(src, + inode.getLocalNameBytes(), inode, snapshotId)); } finally { fsd.readUnlock(); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/XAttrStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/XAttrStorage.java index 7e843d207ee..e38648d5e42 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/XAttrStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/XAttrStorage.java @@ -57,11 +57,11 @@ public class XAttrStorage { *

* Must be called while holding the FSDirectory read lock. * - * @param inode INode to read. + * @param inodeAttr INodeAttributes to read. * @return List XAttr list. */ - public static List readINodeXAttrs(INode inode) { - XAttrFeature f = inode.getXAttrFeature(); + public static List readINodeXAttrs(INodeAttributes inodeAttr) { + XAttrFeature f = inodeAttr.getXAttrFeature(); return f == null ? ImmutableList. of() : f.getXAttrs(); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeAttributeProvider.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeAttributeProvider.java index 111c67ce652..c5f428bea4b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeAttributeProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeAttributeProvider.java @@ -20,16 +20,16 @@ package org.apache.hadoop.hdfs.server.namenode; import java.io.IOException; import java.security.PrivilegedExceptionAction; import java.util.HashSet; +import java.util.Map; import java.util.Set; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.permission.AclEntry; -import org.apache.hadoop.fs.permission.AclEntryType; -import org.apache.hadoop.fs.permission.FsAction; -import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.fs.XAttr; +import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -131,7 +131,17 @@ public class TestINodeAttributeProvider { @Override public XAttrFeature getXAttrFeature() { - return (useDefault) ? inode.getXAttrFeature() : null; + XAttrFeature x; + if (useDefault) { + x = inode.getXAttrFeature(); + } else { + x = new XAttrFeature(ImmutableList.copyOf( + Lists.newArrayList( + new XAttr.Builder().setName("test") + .setValue(new byte[] {1, 2}) + .build()))); + } + return x; } @Override @@ -218,12 +228,24 @@ public class TestINodeAttributeProvider { FileStatus status = fs.getFileStatus(new Path("/user/xxx")); Assert.assertEquals(System.getProperty("user.name"), status.getOwner()); Assert.assertEquals("supergroup", status.getGroup()); - Assert.assertEquals(new FsPermission((short)0755), status.getPermission()); + Assert.assertEquals(new FsPermission((short) 0755), status.getPermission()); fs.mkdirs(new Path("/user/authz")); - status = fs.getFileStatus(new Path("/user/authz")); + Path p = new Path("/user/authz"); + status = fs.getFileStatus(p); Assert.assertEquals("foo", status.getOwner()); Assert.assertEquals("bar", status.getGroup()); Assert.assertEquals(new FsPermission((short) 0770), status.getPermission()); + AclStatus aclStatus = fs.getAclStatus(p); + Assert.assertEquals(1, aclStatus.getEntries().size()); + Assert.assertEquals(AclEntryType.GROUP, aclStatus.getEntries().get(0) + .getType()); + Assert.assertEquals("xxx", aclStatus.getEntries().get(0) + .getName()); + Assert.assertEquals(FsAction.ALL, aclStatus.getEntries().get(0) + .getPermission()); + Map xAttrs = fs.getXAttrs(p); + Assert.assertTrue(xAttrs.containsKey("user.test")); + Assert.assertEquals(2, xAttrs.get("user.test").length); } }