Merge branch 'trunk' into HDFS-6584
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d2b0009
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d2b0009
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d2b0009
Branch: refs/heads/HDFS-6581
Commit: 2d2b0009e662db75cf22e2ce8d618ed0a8e61c2f
Parents: 911979c ee21b13
Author: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Authored: Thu Sep 18 13:00:29 2014 +0800
Committer: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Committed: Thu Sep 18 13:00:29 2014 +0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 7 +-
.../apache/hadoop/crypto/CryptoInputStream.java | 11 +-
.../hadoop/crypto/key/KeyProviderFactory.java | 3 +-
.../java/org/apache/hadoop/fs/FileStatus.java | 9 +
.../hadoop/fs/permission/FsPermission.java | 7 +
.../src/site/markdown/filesystem/filesystem.md | 31 ++++
.../hadoop/crypto/CryptoStreamsTestBase.java | 18 +-
.../fs/contract/AbstractContractOpenTest.java | 12 ++
hadoop-common-project/hadoop-kms/pom.xml | 5 +
.../hadoop-kms/src/main/conf/kms-site.xml | 59 +++++-
.../key/kms/server/KMSAuthenticationFilter.java | 7 +-
.../crypto/key/kms/server/KMSConfiguration.java | 4 +
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 14 +-
.../hadoop-kms/src/site/apt/index.apt.vm | 163 ++++++++++++-----
.../hadoop/crypto/key/kms/server/MiniKMS.java | 2 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 7 +-
.../crypto/key/kms/server/TestKMSWithZK.java | 179 +++++++++++++++++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 12 ++
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 1 +
.../java/org/apache/hadoop/hdfs/DFSUtil.java | 41 +++--
.../hadoop/hdfs/protocol/FsAclPermission.java | 77 --------
.../hdfs/protocol/FsPermissionExtension.java | 89 +++++++++
.../apache/hadoop/hdfs/protocolPB/PBHelper.java | 4 +-
.../server/namenode/EncryptionZoneManager.java | 17 +-
.../hdfs/server/namenode/FSDirectory.java | 35 +++-
.../org/apache/hadoop/hdfs/web/JsonUtil.java | 16 +-
.../src/main/resources/hdfs-default.xml | 8 +
.../src/site/apt/TransparentEncryption.apt.vm | 6 +
.../apache/hadoop/cli/TestCryptoAdminCLI.java | 2 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 136 +++++++++++++-
.../hadoop/hdfs/TestEncryptionZonesWithHA.java | 3 +-
.../hadoop/hdfs/TestReservedRawPaths.java | 3 +-
.../hdfs/server/namenode/FSAclBaseTest.java | 5 +-
hadoop-yarn-project/CHANGES.txt | 6 +
.../yarn/security/ContainerTokenIdentifier.java | 4 +-
.../metrics/SystemMetricsPublisher.java | 8 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 6 +-
.../metrics/TestSystemMetricsPublisher.java | 8 +-
.../attempt/TestRMAppAttemptTransitions.java | 5 +-
.../server/TestContainerManagerSecurity.java | 92 ++++++++++
40 files changed, 917 insertions(+), 205 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------
diff --cc
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
index 3426bf2,56105d9..9346ea5
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
@@@ -2438,10 -2391,10 +2451,10 @@@ public class FSDirectory implements Clo
new HdfsLocatedFileStatus(size, node.isDirectory(), replication,
blocksize, node.getModificationTime(snapshot),
node.getAccessTime(snapshot),
- getPermissionForFileStatus(node, snapshot),
+ getPermissionForFileStatus(node, snapshot, isEncrypted),
node.getUserName(snapshot), node.getGroupName(snapshot),
node.isSymlink() ? node.asSymlink().getSymlink() : null, path,
- node.getId(), loc, childrenNum, feInfo);
+ node.getId(), loc, childrenNum, feInfo, storagePolicy);
// Set caching information for the located blocks.
if (loc != null) {
CacheManager cacheManager = namesystem.getCacheManager();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d2b0009/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------
