Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E7DC4200B50 for ; Fri, 24 Jun 2016 08:05:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E667E160A68; Fri, 24 Jun 2016 06:05:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 36E16160A59 for ; Fri, 24 Jun 2016 08:05:52 +0200 (CEST) Received: (qmail 48881 invoked by uid 500); 24 Jun 2016 06:05:38 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 40766 invoked by uid 99); 24 Jun 2016 06:05:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2016 06:05:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04D9CE5723; Fri, 24 Jun 2016 06:05:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Fri, 24 Jun 2016 06:06:20 -0000 Message-Id: <4ebffa9947bb41eeabd7b9c0fe937e92@git.apache.org> In-Reply-To: <5fc8484880aa41e0adb1a5360d0899ef@git.apache.org> References: <5fc8484880aa41e0adb1a5360d0899ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/49] hadoop git commit: Merge branch 'HDFS-1312' into trunk archived-at: Fri, 24 Jun 2016 06:05:53 -0000 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 Authored: Thu Jun 23 23:00:56 2016 -0700 Committer: Arpit Agarwal 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