Author: szetszwo
Date: Wed Jun 18 18:45:23 2014
New Revision: 1603572
URL: http://svn.apache.org/r1603572
Log:
svn merge -c 1603571 from trunk for HDFS-6530. Fix Balancer documentation.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project:r1603571
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1603571
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1603571
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm?rev=1603572&r1=1603571&r2=1603572&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
Wed Jun 18 18:45:23 2014
@@ -306,9 +306,9 @@ Administration Commands
Runs a cluster balancing utility. An administrator can simply press Ctrl-C
to stop the rebalancing process. See
- {{{../hadoop-hdfs/HdfsUserGuide.html#Rebalancer}Rebalancer}} for more
details.
+ {{{../hadoop-hdfs/HdfsUserGuide.html#Balancer}Balancer}} for more details.
- Usage: <<<hadoop balancer [-threshold <threshold>]>>>
+ Usage: <<<hadoop balancer [-threshold <threshold>] [-policy <policy>]>>>
*------------------------+-----------------------------------------------------------+
|| COMMAND_OPTION | Description
@@ -316,6 +316,11 @@ Administration Commands
| -threshold <threshold> | Percentage of disk capacity. This overwrites the
| default threshold.
*------------------------+-----------------------------------------------------------+
+| -policy <policy> | <<<datanode>>> (default): Cluster is balanced if
each datanode is balanced. \
+ | <<<blockpool>>>: Cluster is balanced if each block
pool in each datanode is balanced.
+*------------------------+-----------------------------------------------------------+
+
+ Note that the <<<blockpool>>> policy is more strict than the <<<datanode>>>
policy.
* <<<daemonlog>>>
