You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/08/10 18:48:03 UTC
[17/19] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Merge branch 'trunk' into HADOOP-12111
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/790433b8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/790433b8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/790433b8
Branch: refs/heads/HADOOP-12111
Commit: 790433b876ebcf5e4976c56d2c8b71d6fb65ebe3
Parents: c393182 8f73bdd
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Aug 10 09:43:33 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Aug 10 09:43:33 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../metrics2/impl/MetricsSinkAdapter.java | 6 +-
.../metrics2/impl/TestMetricsSystemImpl.java | 60 ++
.../hadoop/hdfs/protocol/ClientProtocol.java | 14 +
.../src/main/proto/ClientNamenodeProtocol.proto | 10 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 16 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 23 +-
...tNamenodeProtocolServerSideTranslatorPB.java | 17 +
.../ClientNamenodeProtocolTranslatorPB.java | 13 +
.../server/blockmanagement/BlockCollection.java | 2 +-
.../hdfs/server/blockmanagement/BlockInfo.java | 36 +-
.../blockmanagement/BlockInfoContiguous.java | 79 ++-
.../BlockInfoContiguousUnderConstruction.java | 403 ++++++++++++
.../BlockInfoUnderConstruction.java | 404 ------------
.../BlockInfoUnderConstructionContiguous.java | 110 ----
.../server/blockmanagement/BlockManager.java | 610 +++++++++----------
.../ContiguousBlockStorageOp.java | 106 ----
.../blockmanagement/DatanodeDescriptor.java | 13 +-
.../server/blockmanagement/DatanodeManager.java | 4 +-
.../blockmanagement/DatanodeStorageInfo.java | 15 +-
.../hdfs/server/namenode/Checkpointer.java | 4 +-
.../hdfs/server/namenode/FSDirAttrOp.java | 23 +
.../hdfs/server/namenode/FSDirTruncateOp.java | 11 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 15 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 15 +-
.../hdfs/server/namenode/FSImageFormat.java | 7 +-
.../server/namenode/FSImageFormatPBINode.java | 6 +-
.../server/namenode/FSImageSerialization.java | 4 +-
.../hdfs/server/namenode/FSNamesystem.java | 66 +-
.../namenode/FileUnderConstructionFeature.java | 10 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 14 +-
.../hdfs/server/namenode/LeaseManager.java | 17 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 6 +
.../hdfs/server/namenode/NamenodeFsck.java | 2 +-
.../hadoop/hdfs/server/namenode/Namesystem.java | 4 +-
.../server/namenode/snapshot/FileDiffList.java | 4 +-
.../hadoop-hdfs/src/site/markdown/WebHDFS.md | 2 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 8 +-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 30 +-
.../hadoop/hdfs/TestBlockStoragePolicy.java | 23 +
.../server/blockmanagement/TestBlockInfo.java | 2 +-
.../TestBlockInfoUnderConstruction.java | 6 +-
.../blockmanagement/TestBlockManager.java | 10 +-
.../blockmanagement/TestHeartbeatHandling.java | 8 +-
.../server/blockmanagement/TestNodeCount.java | 2 +-
.../TestOverReplicatedBlocks.java | 4 +-
.../blockmanagement/TestReplicationPolicy.java | 7 +-
.../namenode/TestBlockUnderConstruction.java | 4 +-
.../TestCommitBlockSynchronization.java | 9 +-
.../hdfs/server/namenode/TestFileTruncate.java | 6 +-
.../hdfs/server/namenode/TestLeaseManager.java | 65 +-
.../namenode/ha/TestRetryCacheWithHA.java | 6 +-
.../server/namenode/ha/TestStandbyIsHot.java | 2 +
.../namenode/snapshot/SnapshotTestHelper.java | 4 +-
hadoop-mapreduce-project/CHANGES.txt | 5 +
.../src/main/resources/mapred-default.xml | 20 +
.../src/site/markdown/EncryptedShuffle.md | 8 +-
.../mapreduce/v2/hs/JobHistoryServer.java | 14 +-
hadoop-yarn-project/CHANGES.txt | 16 +
.../yarn/api/records/ApplicationReport.java | 13 +
.../yarn/api/records/QueueStatistics.java | 36 ++
.../src/main/proto/yarn_protos.proto | 4 +
.../hadoop/yarn/client/cli/ApplicationCLI.java | 2 +
.../apache/hadoop/yarn/client/cli/TopCLI.java | 24 +-
.../hadoop/yarn/client/cli/TestYarnCLI.java | 2 +
.../impl/pb/ApplicationReportPBImpl.java | 37 ++
.../records/impl/pb/QueueStatisticsPBImpl.java | 36 ++
.../hadoop/yarn/server/utils/BuilderUtils.java | 4 +-
.../hadoop/yarn/server/webapp/AppBlock.java | 5 +
.../hadoop/yarn/server/webapp/WebPageUtils.java | 4 +-
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 9 +
.../yarn/server/nodemanager/NodeManager.java | 13 +-
.../nodemanager/metrics/NodeManagerMetrics.java | 13 +-
.../server/resourcemanager/ResourceManager.java | 11 +-
.../resourcemanager/reservation/Plan.java | 3 +-
.../resourcemanager/reservation/PlanView.java | 11 +-
.../ReservationSchedulerConfiguration.java | 14 +-
.../reservation/ReservationSystem.java | 15 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 8 +-
.../scheduler/AbstractYarnScheduler.java | 10 +-
.../scheduler/capacity/AbstractCSQueue.java | 3 +
.../scheduler/capacity/CapacityScheduler.java | 36 +-
.../scheduler/capacity/LeafQueue.java | 18 +-
.../scheduler/capacity/ParentQueue.java | 14 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 8 +-
.../resourcemanager/webapp/RMAppsBlock.java | 7 +-
.../resourcemanager/webapp/dao/AppInfo.java | 12 +-
.../webapp/dao/CapacitySchedulerQueueInfo.java | 18 +
.../webapp/dao/FairSchedulerQueueInfo.java | 24 +-
.../yarn/server/resourcemanager/MockAM.java | 14 +-
.../reservation/ReservationSystemTestUtil.java | 177 ++----
.../TestCapacityReservationSystem.java | 94 ---
.../TestCapacitySchedulerPlanFollower.java | 11 +-
.../reservation/TestFairReservationSystem.java | 127 ----
.../TestFairSchedulerPlanFollower.java | 71 +--
.../reservation/TestReservationSystem.java | 213 +++++++
.../capacity/TestApplicationPriority.java | 69 +--
.../webapp/TestRMWebServicesApps.java | 24 +-
.../webapp/TestRMWebServicesCapacitySched.java | 4 +-
.../src/site/markdown/ResourceManagerRest.md | 7 +
100 files changed, 1922 insertions(+), 1716 deletions(-)
----------------------------------------------------------------------