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 ar...@apache.org on 2016/06/24 06:06:20 UTC
[49/49] hadoop git commit: Merge branch 'HDFS-1312' into trunk
Merge branch 'HDFS-1312' into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63148438
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63148438
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63148438
Branch: refs/heads/trunk
Commit: 6314843881b4c67d08215e60293f8b33242b9416
Parents: 0b9edf6 b2584be
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Jun 23 23:00:56 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Jun 23 23:00:56 2016 -0700
----------------------------------------------------------------------
.../hdfs/protocol/ClientDatanodeProtocol.java | 30 +
.../ClientDatanodeProtocolTranslatorPB.java | 91 +
.../server/datanode/DiskBalancerWorkItem.java | 287 +
.../server/datanode/DiskBalancerWorkStatus.java | 277 +
.../src/main/proto/ClientDatanodeProtocol.proto | 86 +
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 +
.../hadoop-hdfs/src/main/bin/hdfs | 6 +
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 20 +
...tDatanodeProtocolServerSideTranslatorPB.java | 91 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 108 +-
.../hdfs/server/datanode/DataNodeMXBean.java | 8 +
.../hdfs/server/datanode/DiskBalancer.java | 1063 ++
.../server/datanode/fsdataset/FsDatasetSpi.java | 11 +
.../datanode/fsdataset/impl/FsDatasetImpl.java | 95 +-
.../datanode/fsdataset/impl/FsVolumeImpl.java | 13 +
.../diskbalancer/DiskBalancerConstants.java | 44 +
.../diskbalancer/DiskBalancerException.java | 101 +
.../diskbalancer/command/CancelCommand.java | 147 +
.../server/diskbalancer/command/Command.java | 437 +
.../diskbalancer/command/ExecuteCommand.java | 115 +
.../diskbalancer/command/HelpCommand.java | 109 +
.../diskbalancer/command/PlanCommand.java | 271 +
.../diskbalancer/command/QueryCommand.java | 104 +
.../diskbalancer/command/ReportCommand.java | 214 +
.../diskbalancer/command/package-info.java | 22 +
.../connectors/ClusterConnector.java | 44 +
.../connectors/ConnectorFactory.java | 55 +
.../connectors/DBNameNodeConnector.java | 162 +
.../connectors/JsonNodeConnector.java | 78 +
.../diskbalancer/connectors/package-info.java | 37 +
.../datamodel/DiskBalancerCluster.java | 391 +
.../datamodel/DiskBalancerDataNode.java | 270 +
.../datamodel/DiskBalancerVolume.java | 361 +
.../datamodel/DiskBalancerVolumeSet.java | 342 +
.../diskbalancer/datamodel/package-info.java | 31 +
.../hdfs/server/diskbalancer/package-info.java | 36 +
.../diskbalancer/planner/GreedyPlanner.java | 264 +
.../server/diskbalancer/planner/MoveStep.java | 262 +
.../server/diskbalancer/planner/NodePlan.java | 190 +
.../server/diskbalancer/planner/Planner.java | 28 +
.../diskbalancer/planner/PlannerFactory.java | 60 +
.../hdfs/server/diskbalancer/planner/Step.java | 109 +
.../diskbalancer/planner/package-info.java | 46 +
.../apache/hadoop/hdfs/tools/DiskBalancer.java | 475 +
.../src/main/resources/hdfs-default.xml | 40 +
.../src/site/markdown/HDFSCommands.md | 22 +
.../src/site/markdown/HDFSDiskbalancer.md | 120 +
.../hdfs/server/balancer/TestBalancer.java | 3 +-
.../server/datanode/SimulatedFSDataset.java | 7 +
.../extdataset/ExternalDatasetImpl.java | 8 +
.../DiskBalancerResultVerifier.java | 45 +
.../diskbalancer/DiskBalancerTestUtil.java | 267 +
.../server/diskbalancer/TestConnectors.java | 85 +
.../server/diskbalancer/TestDataModels.java | 227 +
.../server/diskbalancer/TestDiskBalancer.java | 257 +
.../diskbalancer/TestDiskBalancerRPC.java | 323 +
.../TestDiskBalancerWithMockMover.java | 628 ++
.../hdfs/server/diskbalancer/TestPlanner.java | 513 +
.../command/TestDiskBalancerCommand.java | 390 +
.../diskbalancer/connectors/NullConnector.java | 59 +
.../diskBalancer/data-cluster-3node-3disk.json | 380 +
.../diskBalancer/data-cluster-64node-3disk.json | 9484 ++++++++++++++++++
62 files changed, 19824 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org