Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/66921274 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/66921274 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/66921274 Branch: refs/heads/HDFS-7240 Commit: 66921274db47b9a96423e09a802c5af3b9798dd1 Parents: 1dc5c7e f414d5e Author: Anu Engineer <[email protected]> Authored: Wed Sep 7 11:19:03 2016 -0700 Committer: Anu Engineer <[email protected]> Committed: Wed Sep 7 11:19:03 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/conf/Configuration.java | 47 +- .../java/org/apache/hadoop/fs/FileContext.java | 8 +- .../java/org/apache/hadoop/fs/FileSystem.java | 7 +- .../hadoop/fs/permission/FsCreateModes.java | 101 + .../hadoop/fs/permission/FsPermission.java | 16 +- .../apache/hadoop/fs/permission/RawParser.java | 44 + .../hadoop/fs/permission/package-info.java | 25 + .../main/java/org/apache/hadoop/ipc/Client.java | 77 +- .../apache/hadoop/ipc/ProtobufRpcEngine.java | 246 +- .../main/java/org/apache/hadoop/ipc/RPC.java | 15 +- .../org/apache/hadoop/ipc/ResponseBuffer.java | 12 +- .../java/org/apache/hadoop/ipc/RpcWritable.java | 20 +- .../main/java/org/apache/hadoop/ipc/Server.java | 392 +- .../java/org/apache/hadoop/security/Groups.java | 33 +- .../apache/hadoop/security/SaslRpcClient.java | 45 +- .../hadoop/security/UserGroupInformation.java | 26 +- .../3.0.0-alpha1/CHANGES.3.0.0-alpha1.md | 3712 ++++++++++++++++++ .../3.0.0-alpha1/RELEASENOTES.3.0.0-alpha1.md | 1854 +++++++++ .../apache/hadoop/conf/TestConfiguration.java | 46 + .../fs/TestLocalFileSystemPermission.java | 149 +- .../hadoop/fs/permission/TestFsPermission.java | 1061 ++--- .../org/apache/hadoop/ipc/RPCCallBenchmark.java | 38 +- .../hadoop/ipc/TestMultipleProtocolServer.java | 236 +- .../apache/hadoop/ipc/TestRPCCallBenchmark.java | 13 - .../apache/hadoop/ipc/TestRPCCompatibility.java | 242 +- .../apache/hadoop/ipc/TestRPCWaitForProxy.java | 37 +- .../java/org/apache/hadoop/ipc/TestRpcBase.java | 50 +- .../java/org/apache/hadoop/ipc/TestSaslRPC.java | 74 +- .../hadoop/security/TestDoAsEffectiveUser.java | 291 +- .../hadoop/security/TestGroupsCaching.java | 91 +- .../security/TestUserGroupInformation.java | 52 +- .../hadoop-common/src/test/proto/test.proto | 4 +- .../src/test/proto/test_rpc_service.proto | 4 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 5 +- .../org/apache/hadoop/hdfs/DataStreamer.java | 16 +- .../hadoop/hdfs/client/impl/DfsClientConf.java | 6 +- .../hadoop/hdfs/protocol/DatanodeInfo.java | 33 +- .../ClientNamenodeProtocolTranslatorPB.java | 14 +- .../hadoop/hdfs/protocolPB/PBHelperClient.java | 41 +- .../hdfs/server/protocol/StorageReport.java | 10 +- .../hadoop/hdfs/web/WebHdfsFileSystem.java | 16 +- .../hdfs/web/resources/PermissionParam.java | 9 +- .../web/resources/UnmaskedPermissionParam.java | 51 + .../src/main/proto/ClientNamenodeProtocol.proto | 2 + .../src/main/proto/hdfs.proto | 2 + .../hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh | 14 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 4 + ...tNamenodeProtocolServerSideTranslatorPB.java | 16 +- .../hadoop/hdfs/server/balancer/Balancer.java | 12 +- .../server/blockmanagement/BlockManager.java | 6 +- .../BlockPlacementPolicyDefault.java | 5 +- .../blockmanagement/DatanodeDescriptor.java | 3 + .../server/blockmanagement/DatanodeManager.java | 9 +- .../server/blockmanagement/DatanodeStats.java | 6 +- .../blockmanagement/DatanodeStorageInfo.java | 8 +- .../blockmanagement/DecommissionManager.java | 7 +- .../hadoop/hdfs/server/datanode/DNConf.java | 18 +- .../hadoop/hdfs/server/datanode/DataNode.java | 4 +- .../hdfs/server/datanode/DirectoryScanner.java | 6 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 24 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 37 +- .../datanode/web/webhdfs/ParameterParser.java | 7 + .../datanode/web/webhdfs/WebHdfsHandler.java | 6 +- .../apache/hadoop/hdfs/server/mover/Mover.java | 12 +- .../hadoop/hdfs/server/namenode/AclStorage.java | 7 +- .../hdfs/server/namenode/CheckpointConf.java | 10 +- .../hdfs/server/namenode/FSDirAppendOp.java | 4 +- .../hdfs/server/namenode/FSDirMkdirOp.java | 3 +- .../hdfs/server/namenode/FSDirSymlinkOp.java | 3 +- .../hdfs/server/namenode/FSDirWriteFileOp.java | 5 +- .../hdfs/server/namenode/FSDirectory.java | 72 +- .../hadoop/hdfs/server/namenode/FSImage.java | 7 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 3 - .../hdfs/server/namenode/ha/EditLogTailer.java | 10 +- .../web/resources/NamenodeWebHdfsMethods.java | 49 +- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 6 +- .../src/main/resources/hdfs-default.xml | 56 +- .../src/site/markdown/HdfsPermissionsGuide.md | 6 + .../hadoop-hdfs/src/site/markdown/WebHDFS.md | 10 +- .../java/org/apache/hadoop/cli/TestAclCLI.java | 6 +- .../cli/TestAclCLIWithPosixAclInheritance.java | 45 + .../hadoop/hdfs/protocolPB/TestPBHelper.java | 24 + .../TestClientProtocolWithDelegationToken.java | 119 - .../blockmanagement/BlockManagerTestUtil.java | 2 +- .../blockmanagement/TestBlockManager.java | 2 +- .../server/datanode/SimulatedFSDataset.java | 2 +- .../extdataset/ExternalDatasetImpl.java | 2 +- .../fsdataset/impl/TestFsDatasetImpl.java | 49 +- .../fsdataset/impl/TestFsVolumeList.java | 40 + .../hdfs/server/namenode/FSAclBaseTest.java | 91 + .../server/namenode/NNThroughputBenchmark.java | 4 +- .../hdfs/server/namenode/TestDeadDatanode.java | 2 +- .../server/namenode/TestGetBlockLocations.java | 2 +- .../namenode/TestNamenodeCapacityReport.java | 36 +- .../namenode/metrics/TestNameNodeMetrics.java | 4 +- .../snapshot/TestRenameWithSnapshots.java | 4 +- .../testAclCLIWithPosixAclInheritance.xml | 1075 +++++ .../mapreduce/v2/hs/server/HSAdminServer.java | 3 - hadoop-project/pom.xml | 7 + hadoop-tools/hadoop-aws/pom.xml | 9 + .../org/apache/hadoop/fs/s3a/Constants.java | 29 +- .../hadoop/fs/s3a/S3AFastOutputStream.java | 6 +- .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 192 +- .../apache/hadoop/fs/s3a/S3AInputStream.java | 6 +- .../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 40 + .../apache/hadoop/fs/s3a/S3ClientFactory.java | 232 ++ .../hadoop/fs/s3native/S3xLoginHelper.java | 3 + .../hadoop/fs/s3a/AbstractS3AMockTest.java | 70 + .../hadoop/fs/s3a/ITestS3AConfiguration.java | 10 +- .../hadoop/fs/s3a/MockS3ClientFactory.java | 40 + .../hadoop/fs/s3a/TestS3AGetFileStatus.java | 126 + .../hadoop/yarn/conf/YarnConfiguration.java | 12 + .../yarn/client/api/impl/TestAMRMClient.java | 7 +- .../src/main/resources/yarn-default.xml | 13 + .../server/nodemanager/ContainerExecutor.java | 9 + .../hadoop/yarn/server/nodemanager/Context.java | 2 + .../nodemanager/DefaultContainerExecutor.java | 6 + .../nodemanager/DockerContainerExecutor.java | 6 + .../nodemanager/LinuxContainerExecutor.java | 5 + .../yarn/server/nodemanager/NodeManager.java | 12 + .../containermanager/ContainerManagerImpl.java | 70 +- .../containermanager/container/Container.java | 8 +- .../container/ContainerImpl.java | 207 +- .../launcher/ContainerLaunch.java | 4 +- .../localizer/ResourceLocalizationService.java | 21 +- .../containermanager/localizer/ResourceSet.java | 192 + .../ContainerLocalizationRequestEvent.java | 2 +- .../localizer/event/LocalizationEventType.java | 2 +- .../timelineservice/NMTimelinePublisher.java | 2 +- .../nodemanager/DummyContainerManager.java | 2 +- .../TestContainerManagerWithLCE.java | 13 +- .../amrmproxy/BaseAMRMProxyTest.java | 6 + .../containermanager/TestContainerManager.java | 137 +- .../TestResourceLocalizationService.java | 7 +- .../TestContainersMonitorResourceChange.java | 7 + .../nodemanager/webapp/MockContainer.java | 17 +- .../resourcemanager/amlauncher/AMLauncher.java | 26 +- .../resourcemanager/rmnode/RMNodeImpl.java | 13 +- .../scheduler/common/fica/FiCaSchedulerApp.java | 27 + .../scheduler/fair/AllocationConfiguration.java | 83 +- .../scheduler/fair/FSLeafQueue.java | 17 +- .../scheduler/fair/FSParentQueue.java | 8 +- .../resourcemanager/scheduler/fair/FSQueue.java | 71 +- .../scheduler/fair/FairScheduler.java | 12 +- .../scheduler/fair/MaxRunningAppsEnforcer.java | 11 +- .../scheduler/fair/NewAppWeightBooster.java | 60 - .../scheduler/fair/QueueManager.java | 45 +- .../scheduler/fair/WeightAdjuster.java | 36 - .../webapp/dao/FairSchedulerQueueInfo.java | 2 +- .../resourcemanager/TestRMNodeTransitions.java | 29 +- .../TestResourceTrackerService.java | 4 +- .../scheduler/capacity/TestLeafQueue.java | 87 + .../scheduler/fair/TestAppRunnability.java | 6 +- .../scheduler/fair/TestFSLeafQueue.java | 10 +- .../scheduler/fair/TestFairScheduler.java | 11 +- .../fair/TestMaxRunningAppsEnforcer.java | 20 +- .../scheduler/fair/TestQueueManager.java | 17 +- 157 files changed, 10596 insertions(+), 2778 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/66921274/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/66921274/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
