Merge remote-tracking branch 'origin/trunk' into HDFS-EC
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/83318534 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83318534 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83318534 Branch: refs/heads/HDFS-EC Commit: 8331853450bc52fb3d8eed61fde52639a5fdb619 Parents: bdc0101 120e1de Author: Vinayakumar B <[email protected]> Authored: Mon Dec 8 14:42:52 2014 +0530 Committer: Vinayakumar B <[email protected]> Committed: Mon Dec 8 14:42:52 2014 +0530 ---------------------------------------------------------------------- .../client/KerberosAuthenticator.java | 6 +- hadoop-common-project/hadoop-common/CHANGES.txt | 21 + .../hadoop-common/src/CMakeLists.txt | 2 +- .../apache/hadoop/crypto/AesCtrCryptoCodec.java | 27 +- .../fs/permission/AccessControlException.java | 66 --- .../hadoop/security/AccessControlException.java | 4 +- .../src/site/apt/NativeLibraries.apt.vm | 18 + .../apache/hadoop/crypto/TestCryptoCodec.java | 64 +++ .../hadoop/crypto/key/kms/server/KMSACLs.java | 26 +- .../kms/server/KeyAuthorizationKeyProvider.java | 4 + .../hadoop/crypto/key/kms/server/TestKMS.java | 13 +- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 5 + .../hadoop/hdfs/nfs/conf/NfsConfigKeys.java | 10 + .../hadoop/hdfs/nfs/nfs3/Nfs3HttpServer.java | 111 ++++ .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 24 +- .../hdfs/nfs/nfs3/TestNfs3HttpServer.java | 89 ++++ .../src/test/resources/core-site.xml | 14 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 31 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 3 + .../datanode/ReplicaNotFoundException.java | 2 +- .../server/namenode/AclEntryStatusFormat.java | 136 +++++ .../hadoop/hdfs/server/namenode/AclFeature.java | 24 +- .../hadoop/hdfs/server/namenode/AclStorage.java | 61 +-- .../server/namenode/EncryptionZoneManager.java | 4 +- .../hadoop/hdfs/server/namenode/FSDirAclOp.java | 244 +++++++++ .../hdfs/server/namenode/FSDirConcatOp.java | 9 +- .../hdfs/server/namenode/FSDirMkdirOp.java | 17 +- .../hdfs/server/namenode/FSDirRenameOp.java | 74 ++- .../hdfs/server/namenode/FSDirSnapshotOp.java | 68 ++- .../server/namenode/FSDirStatAndListingOp.java | 35 +- .../hdfs/server/namenode/FSDirectory.java | 329 +++--------- .../hdfs/server/namenode/FSEditLogLoader.java | 18 +- .../server/namenode/FSImageFormatPBINode.java | 22 +- .../hdfs/server/namenode/FSNDNCacheOp.java | 124 +++++ .../hdfs/server/namenode/FSNamesystem.java | 531 +++++++------------ .../server/namenode/FSPermissionChecker.java | 61 +-- .../hdfs/server/namenode/INodesInPath.java | 21 +- .../hadoop/hdfs/server/namenode/NNConf.java | 104 ---- .../snapshot/FSImageFormatPBSnapshot.java | 13 +- .../namenode/snapshot/SnapshotManager.java | 50 +- .../hdfs/server/namenode/FSAclBaseTest.java | 4 +- .../hdfs/server/namenode/TestAuditLogger.java | 79 +-- .../namenode/TestFSPermissionChecker.java | 10 +- .../server/namenode/TestSnapshotPathINodes.java | 20 +- .../namenode/snapshot/TestSnapshotManager.java | 14 +- hadoop-mapreduce-project/CHANGES.txt | 3 + .../apache/hadoop/mapred/MapReduceChildJVM.java | 34 +- .../v2/app/job/impl/TestMapReduceChildJVM.java | 71 ++- .../apache/hadoop/mapreduce/v2/util/MRApps.java | 80 ++- .../apache/hadoop/mapred/FileOutputFormat.java | 4 +- .../java/org/apache/hadoop/mapred/TaskLog.java | 4 + .../apache/hadoop/mapreduce/MRJobConfig.java | 14 + .../src/main/resources/mapred-default.xml | 28 + .../org/apache/hadoop/mapred/YARNRunner.java | 9 +- hadoop-yarn-project/CHANGES.txt | 28 + hadoop-yarn-project/hadoop-yarn/bin/yarn | 5 + .../hadoop-yarn/hadoop-yarn-api/pom.xml | 1 + .../hadoop/yarn/conf/YarnConfiguration.java | 16 +- .../yarn/server/api/SCMAdminProtocol.java | 53 ++ .../yarn/server/api/SCMAdminProtocolPB.java | 31 ++ .../RunSharedCacheCleanerTaskRequest.java | 37 ++ .../RunSharedCacheCleanerTaskResponse.java | 58 ++ .../main/proto/server/SCM_Admin_protocol.proto | 29 + .../src/main/proto/yarn_service_protos.proto | 11 + .../org/apache/hadoop/yarn/client/SCMAdmin.java | 183 +++++++ .../hadoop/yarn/client/cli/ApplicationCLI.java | 8 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 41 +- .../hadoop/yarn/ContainerLogAppender.java | 11 +- .../yarn/ContainerRollingLogAppender.java | 11 +- .../pb/client/SCMAdminProtocolPBClientImpl.java | 73 +++ .../service/SCMAdminProtocolPBServiceImpl.java | 57 ++ .../RunSharedCacheCleanerTaskRequestPBImpl.java | 53 ++ ...RunSharedCacheCleanerTaskResponsePBImpl.java | 66 +++ .../src/main/resources/yarn-default.xml | 12 + .../hadoop/yarn/TestContainerLogAppender.java | 1 + .../nodemanager/metrics/NodeManagerMetrics.java | 19 +- .../impl/container-executor.c | 2 +- .../main/resources/container-log4j.properties | 29 +- .../metrics/TestNodeManagerMetrics.java | 17 +- .../yarn/server/resourcemanager/RMContext.java | 3 + .../server/resourcemanager/RMContextImpl.java | 11 + .../server/resourcemanager/ResourceManager.java | 2 + .../ProportionalCapacityPreemptionPolicy.java | 170 +++++- .../rmcontainer/RMContainerImpl.java | 9 +- .../CapacitySchedulerConfiguration.java | 10 +- .../security/DelegationTokenRenewer.java | 12 +- .../resourcemanager/TestClientRMService.java | 1 + .../server/resourcemanager/TestRMRestart.java | 91 ++++ ...estProportionalCapacityPreemptionPolicy.java | 283 +++++++++- .../rmcontainer/TestRMContainerImpl.java | 6 +- .../scheduler/capacity/TestQueueParsing.java | 110 ++++ .../SCMAdminProtocolService.java | 146 +++++ .../sharedcachemanager/SharedCacheManager.java | 8 + .../TestSCMAdminProtocolService.java | 135 +++++ 94 files changed, 3501 insertions(+), 1207 deletions(-) ----------------------------------------------------------------------
