Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/835dc594 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/835dc594 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/835dc594 Branch: refs/heads/HDFS-1312 Commit: 835dc594a75e19634b35e9e43db765f181ad21e5 Parents: 53255c3 2759689 Author: Anu Engineer <aengin...@apache.org> Authored: Fri Mar 4 20:23:13 2016 -0800 Committer: Anu Engineer <aengin...@apache.org> Committed: Fri Mar 4 20:23:13 2016 -0800 ---------------------------------------------------------------------- .../authentication/util/KerberosName.java | 17 +- .../hadoop-auth/src/site/site.xml | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 18364 ----------------- .../src/site/markdown/CLIMiniCluster.md.vm | 5 +- .../src/site/markdown/ClusterSetup.md | 18 +- .../src/site/markdown/CommandsManual.md | 29 +- .../src/site/markdown/Compatibility.md | 44 +- .../src/site/markdown/CredentialProviderAPI.md | 11 +- .../src/site/markdown/FileSystemShell.md | 45 +- .../src/site/markdown/HttpAuthentication.md | 4 +- .../site/markdown/InterfaceClassification.md | 8 +- .../hadoop-common/src/site/markdown/Metrics.md | 26 +- .../src/site/markdown/NativeLibraries.md.vm | 12 +- .../src/site/markdown/RackAwareness.md | 4 +- .../src/site/markdown/SecureMode.md | 32 +- .../src/site/markdown/ServiceLevelAuth.md | 11 +- .../src/site/markdown/SingleCluster.md.vm | 16 +- .../src/site/markdown/Superusers.md | 7 +- .../hadoop-common/src/site/markdown/Tracing.md | 11 +- .../src/site/markdown/UnixShellGuide.md | 2 + .../hadoop-common/src/site/site.xml | 2 +- .../hadoop-kms/src/site/site.xml | 2 +- .../hadoop-hdfs-httpfs/src/site/site.xml | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 14611 ------------- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 10 +- .../java/org/apache/hadoop/hdfs/DFSUtil.java | 35 + ...eLifelineProtocolClientSideTranslatorPB.java | 113 + .../protocolPB/DatanodeLifelineProtocolPB.java | 40 + ...eLifelineProtocolServerSideTranslatorPB.java | 71 + .../server/blockmanagement/DatanodeManager.java | 41 + .../blockmanagement/HeartbeatManager.java | 16 +- .../hdfs/server/datanode/BPOfferService.java | 13 +- .../hdfs/server/datanode/BPServiceActor.java | 211 +- .../hdfs/server/datanode/BlockPoolManager.java | 41 +- .../hadoop/hdfs/server/datanode/DNConf.java | 25 + .../hadoop/hdfs/server/datanode/DataNode.java | 14 + .../datanode/metrics/DataNodeMetrics.java | 5 + .../hdfs/server/namenode/FSNamesystem.java | 31 + .../hdfs/server/namenode/NameNodeRpcServer.java | 36 +- .../protocol/DatanodeLifelineProtocol.java | 42 + .../hdfs/server/protocol/NamenodeProtocols.java | 1 + .../main/proto/DatanodeLifelineProtocol.proto | 43 + .../src/main/resources/hdfs-default.xml | 48 +- .../src/site/markdown/HDFSCommands.md | 4 + .../hadoop-hdfs/src/site/site.xml | 2 +- .../hdfs/server/balancer/TestBalancer.java | 88 +- .../server/datanode/TestBPOfferService.java | 4 +- .../server/datanode/TestBlockPoolManager.java | 4 +- .../datanode/TestBpServiceActorScheduler.java | 17 +- .../server/datanode/TestDataNodeLifeline.java | 300 + .../server/datanode/TestDatanodeRegister.java | 2 +- hadoop-mapreduce-project/CHANGES.txt | 8906 -------- .../src/site/site.xml | 2 +- hadoop-project/src/site/site.xml | 2 +- hadoop-tools/hadoop-openstack/src/site/site.xml | 2 +- hadoop-yarn-project/CHANGES.txt | 6905 ------- .../hadoop-yarn-site/src/site/site.xml | 2 +- pom.xml | 3 +- 59 files changed, 1223 insertions(+), 49142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/835dc594/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/835dc594/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/835dc594/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ----------------------------------------------------------------------
