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

HDFS-9273. ACLs on root directory may be lost after NN restart. Contributed by Xiao Chen. 

(cherry picked from commit 1b525a9c32)
This commit is contained in:
cnauroth 2015-10-21 16:39:02 -07:00
parent 7a9b97e6b7
commit faf1c60899
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1275,6 +1275,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9274. Default value of dfs.datanode.directoryscan.throttle.limit.ms.per.sec HDFS-9274. Default value of dfs.datanode.directoryscan.throttle.limit.ms.per.sec
should be consistent. (Yi Liu via zhz) should be consistent. (Yi Liu via zhz)
HDFS-9273. ACLs on root directory may be lost after NN restart.
(Xiao Chen via cnauroth)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
View File

@ -395,6 +395,10 @@ public final class FSImageFormatPBINode {
} }
dir.rootDir.cloneModificationTime(root); dir.rootDir.cloneModificationTime(root);
dir.rootDir.clonePermissionStatus(root); dir.rootDir.clonePermissionStatus(root);
final AclFeature af = root.getFeature(AclFeature.class);
if (af != null) {
dir.rootDir.addAclFeature(af);
}
// root dir supports having extended attributes according to POSIX // root dir supports having extended attributes according to POSIX
final XAttrFeature f = root.getXAttrFeature(); final XAttrFeature f = root.getXAttrFeature();
if (f != null) { if (f != null) {

29
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImageWithAcl.java
View File

@ -206,6 +206,35 @@ public class TestFSImageWithAcl {
doTestDefaultAclNewChildren(false); doTestDefaultAclNewChildren(false);
} }
@Test
public void testRootACLAfterLoadingFsImage() throws IOException {
DistributedFileSystem fs = cluster.getFileSystem();
Path rootdir = new Path("/");
AclEntry e1 = new AclEntry.Builder().setName("foo")
.setPermission(ALL).setScope(ACCESS).setType(GROUP).build();
AclEntry e2 = new AclEntry.Builder().setName("bar")
.setPermission(READ).setScope(ACCESS).setType(GROUP).build();
fs.modifyAclEntries(rootdir, Lists.newArrayList(e1, e2));
AclStatus s = cluster.getNamesystem().getAclStatus(rootdir.toString());
AclEntry[] returned =
Lists.newArrayList(s.getEntries()).toArray(new AclEntry[0]);
Assert.assertArrayEquals(
new AclEntry[] { aclEntry(ACCESS, GROUP, READ_EXECUTE),
aclEntry(ACCESS, GROUP, "bar", READ),
aclEntry(ACCESS, GROUP, "foo", ALL) }, returned);
// restart - hence save and load from fsimage
restart(fs, true);
s = cluster.getNamesystem().getAclStatus(rootdir.toString());
returned = Lists.newArrayList(s.getEntries()).toArray(new AclEntry[0]);
Assert.assertArrayEquals(
new AclEntry[] { aclEntry(ACCESS, GROUP, READ_EXECUTE),
aclEntry(ACCESS, GROUP, "bar", READ),
aclEntry(ACCESS, GROUP, "foo", ALL) }, returned);
}
/** /**
* Restart the NameNode, optionally saving a new checkpoint. * Restart the NameNode, optionally saving a new checkpoint.
* *