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 024B6200CCA for ; Wed, 19 Jul 2017 17:26:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 00753169398; Wed, 19 Jul 2017 15:26:38 +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 2089B169396 for ; Wed, 19 Jul 2017 17:26:36 +0200 (CEST) Received: (qmail 65273 invoked by uid 500); 19 Jul 2017 15:26:36 -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 65264 invoked by uid 99); 19 Jul 2017 15:26:36 -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; Wed, 19 Jul 2017 15:26:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9994E967F; Wed, 19 Jul 2017 15:26:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brahma@apache.org To: common-commits@hadoop.apache.org Date: Wed, 19 Jul 2017 15:26:36 -0000 Message-Id: <21bf8094f1d94114ba2e61181e718e6f@git.apache.org> In-Reply-To: <9c9139021d47410e8ad7da9b4bdc08d5@git.apache.org> References: <9c9139021d47410e8ad7da9b4bdc08d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: HDFS-12067. Correct dfsadmin commands usage message to reflects IPC port. Contributed by steven-wugang. archived-at: Wed, 19 Jul 2017 15:26:38 -0000 HDFS-12067. Correct dfsadmin commands usage message to reflects IPC port. Contributed by steven-wugang. (cherry picked from commit f8cd55fe33665faf2d1b14df231516fc891118fc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/979d37ae Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/979d37ae Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/979d37ae Branch: refs/heads/branch-2 Commit: 979d37ae21413b97170a89631f0879b9d2d280ff Parents: 057631c Author: Brahma Reddy Battula Authored: Wed Jul 19 23:21:43 2017 +0800 Committer: Brahma Reddy Battula Committed: Wed Jul 19 23:22:40 2017 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 57 ++++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/979d37ae/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index bea3441..fb8908c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -1082,29 +1082,39 @@ public class DFSAdmin extends FsShell { "\tor gets a list of reconfigurable properties.\n" + "\tThe second parameter specifies the node type\n"; - String genericRefresh = "-refresh: Arguments are [arg1..argn]\n" + - "\tTriggers a runtime-refresh of the resource specified by \n" + - "\ton . All other args after are sent to the host.\n"; + String genericRefresh = "-refresh: Arguments are " + + " [arg1..argn]\n" + + "\tTriggers a runtime-refresh of the resource specified by " + + " on .\n" + + "\tAll other args after are sent to the host.\n" + + "\tThe ipc_port is determined by 'dfs.datanode.ipc.address'," + + "default is DFS_DATANODE_IPC_DEFAULT_PORT.\n"; String printTopology = "-printTopology: Print a tree of the racks and their\n" + "\t\tnodes as reported by the Namenode\n"; - String refreshNamenodes = "-refreshNamenodes: Takes a datanodehost:port as argument,\n"+ - "\t\tFor the given datanode, reloads the configuration files,\n" + - "\t\tstops serving the removed block-pools\n"+ - "\t\tand starts serving new block-pools\n"; + String refreshNamenodes = "-refreshNamenodes: Takes a " + + "datanodehost:ipc_port as argument,For the given datanode\n" + + "\t\treloads the configuration files,stops serving the removed\n" + + "\t\tblock-pools and starts serving new block-pools.\n" + + "\t\tThe ipc_port is determined by 'dfs.datanode.ipc.address'," + + "default is DFS_DATANODE_IPC_DEFAULT_PORT.\n"; - String getVolumeReport = "-getVolumeReport: Takes a datanodehost:port as " - + "argument,\n\t\tFor the given datanode, get the volume report\n"; - - String deleteBlockPool = "-deleteBlockPool: Arguments are datanodehost:port, blockpool id\n"+ - "\t\t and an optional argument \"force\". If force is passed,\n"+ - "\t\t block pool directory for the given blockpool id on the given\n"+ - "\t\t datanode is deleted along with its contents, otherwise\n"+ - "\t\t the directory is deleted only if it is empty. The command\n" + - "\t\t will fail if datanode is still serving the block pool.\n" + - "\t\t Refer to refreshNamenodes to shutdown a block pool\n" + - "\t\t service on a datanode.\n"; + String getVolumeReport = "-getVolumeReport: Takes a datanodehost:ipc_port"+ + " as argument,For the given datanode,get the volume report.\n" + + "\t\tThe ipc_port is determined by 'dfs.datanode.ipc.address'," + + "default is DFS_DATANODE_IPC_DEFAULT_PORT.\n"; + + String deleteBlockPool = "-deleteBlockPool: Arguments are " + + "datanodehost:ipc_port, blockpool id and an optional argument\n" + + "\t\t\"force\". If force is passed,block pool directory for\n" + + "\t\tthe given blockpool id on the given datanode is deleted\n" + + "\t\talong with its contents,otherwise the directory is deleted\n"+ + "\t\tonly if it is empty.The command will fail if datanode is\n" + + "\t\tstill serving the block pool.Refer to refreshNamenodes to\n" + + "\t\tshutdown a block pool service on a datanode.\n" + + "\t\tThe ipc_port is determined by 'dfs.datanode.ipc.address'," + + "default is DFS_DATANODE_IPC_DEFAULT_PORT.\n"; String setBalancerBandwidth = "-setBalancerBandwidth :\n" + "\tChanges the network bandwidth used by each datanode during\n" + @@ -1863,23 +1873,24 @@ public class DFSAdmin extends FsShell { + " [-refreshCallQueue]"); } else if ("-reconfig".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" - + " [-reconfig " + + " [-reconfig " + "]"); } else if ("-refresh".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" - + " [-refresh [arg1..argn]"); + + " [-refresh " + + " [arg1..argn]"); } else if ("-printTopology".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" + " [-printTopology]"); } else if ("-refreshNamenodes".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" - + " [-refreshNamenodes datanode-host:port]"); + + " [-refreshNamenodes datanode-host:ipc_port]"); } else if ("-getVolumeReport".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" - + " [-getVolumeReport datanode-host:port]"); + + " [-getVolumeReport datanode-host:ipc_port]"); } else if ("-deleteBlockPool".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" - + " [-deleteBlockPool datanode-host:port blockpoolId [force]]"); + + " [-deleteBlockPool datanode-host:ipc_port blockpoolId [force]]"); } else if ("-setBalancerBandwidth".equals(cmd)) { System.err.println("Usage: hdfs dfsadmin" + " [-setBalancerBandwidth ]"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org