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 8FDD9200BDA for ; Tue, 13 Dec 2016 22:12:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8E7E7160B31; Tue, 13 Dec 2016 21:12:19 +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 B2F10160B07 for ; Tue, 13 Dec 2016 22:12:18 +0100 (CET) Received: (qmail 45603 invoked by uid 500); 13 Dec 2016 21:12:17 -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 45166 invoked by uid 99); 13 Dec 2016 21:12:17 -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; Tue, 13 Dec 2016 21:12:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EAEB3F2DD2; Tue, 13 Dec 2016 21:12:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xgong@apache.org To: common-commits@hadoop.apache.org Date: Tue, 13 Dec 2016 21:12:19 -0000 Message-Id: <648d5de50d454507b492150dba384de7@git.apache.org> In-Reply-To: <8d3b3450f19f44c2820483aa15032d25@git.apache.org> References: <8d3b3450f19f44c2820483aa15032d25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] hadoop git commit: HDFS-11226. cacheadmin, cryptoadmin and storagepolicyadmin should support generic options. Contributed by Brahma Reddy Battula archived-at: Tue, 13 Dec 2016 21:12:19 -0000 HDFS-11226. cacheadmin, cryptoadmin and storagepolicyadmin should support generic options. Contributed by Brahma Reddy Battula Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/754f15ba Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/754f15ba Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/754f15ba Branch: refs/heads/YARN-5734 Commit: 754f15bae61b81ad3c2e3f722d1feaebf374e2c4 Parents: 2d4731c Author: Mingliang Liu Authored: Mon Dec 12 17:36:52 2016 -0800 Committer: Mingliang Liu Committed: Mon Dec 12 18:21:15 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java | 8 ++++++-- .../main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java | 8 ++++++-- .../org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java | 6 +++++- 3 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/754f15ba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java index 270a662..522f701 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java @@ -45,6 +45,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import com.google.common.base.Joiner; +import org.apache.hadoop.util.ToolRunner; /** * This class implements command-line operations on the HDFS Cache. @@ -64,6 +65,7 @@ public class CacheAdmin extends Configured implements Tool { public int run(String[] args) throws IOException { if (args.length == 0) { AdminHelper.printUsage(false, "cacheadmin", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } AdminHelper.Command command = AdminHelper.determineCommand(args[0], @@ -74,6 +76,7 @@ public class CacheAdmin extends Configured implements Tool { System.err.println("Command names must start with dashes."); } AdminHelper.printUsage(false, "cacheadmin", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } List argsList = new LinkedList(); @@ -88,9 +91,10 @@ public class CacheAdmin extends Configured implements Tool { } } - public static void main(String[] argsArray) throws IOException { + public static void main(String[] argsArray) throws Exception { CacheAdmin cacheAdmin = new CacheAdmin(new Configuration()); - System.exit(cacheAdmin.run(argsArray)); + int res = ToolRunner.run(cacheAdmin, argsArray); + System.exit(res); } private static CacheDirectiveInfo.Expiration parseExpirationString(String ttlString) http://git-wip-us.apache.org/repos/asf/hadoop/blob/754f15ba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java index b78da31..225f11a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CryptoAdmin.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hdfs.protocol.EncryptionZone; import org.apache.hadoop.tools.TableListing; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; +import org.apache.hadoop.util.ToolRunner; /** * This class implements crypto command-line operations. @@ -54,6 +55,7 @@ public class CryptoAdmin extends Configured implements Tool { public int run(String[] args) throws IOException { if (args.length == 0) { AdminHelper.printUsage(false, "crypto", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } final AdminHelper.Command command = AdminHelper.determineCommand(args[0], @@ -64,6 +66,7 @@ public class CryptoAdmin extends Configured implements Tool { System.err.println("Command names must start with dashes."); } AdminHelper.printUsage(false, "crypto", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } final List argsList = new LinkedList(); @@ -78,9 +81,10 @@ public class CryptoAdmin extends Configured implements Tool { } } - public static void main(String[] argsArray) throws IOException { + public static void main(String[] argsArray) throws Exception { final CryptoAdmin cryptoAdmin = new CryptoAdmin(new Configuration()); - System.exit(cryptoAdmin.run(argsArray)); + int res = ToolRunner.run(cryptoAdmin, argsArray); + System.exit(res); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/754f15ba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java index 24079b3..d99b88a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/StoragePolicyAdmin.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; import org.apache.hadoop.tools.TableListing; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; +import org.apache.hadoop.util.ToolRunner; import java.io.IOException; import java.util.Arrays; @@ -42,7 +43,8 @@ public class StoragePolicyAdmin extends Configured implements Tool { public static void main(String[] argsArray) throws Exception { final StoragePolicyAdmin admin = new StoragePolicyAdmin(new Configuration()); - System.exit(admin.run(argsArray)); + int res = ToolRunner.run(admin, argsArray); + System.exit(res); } public StoragePolicyAdmin(Configuration conf) { @@ -53,6 +55,7 @@ public class StoragePolicyAdmin extends Configured implements Tool { public int run(String[] args) throws Exception { if (args.length == 0) { AdminHelper.printUsage(false, "storagepolicies", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } final AdminHelper.Command command = AdminHelper.determineCommand(args[0], @@ -63,6 +66,7 @@ public class StoragePolicyAdmin extends Configured implements Tool { System.err.println("Command names must start with dashes."); } AdminHelper.printUsage(false, "storagepolicies", COMMANDS); + ToolRunner.printGenericCommandUsage(System.err); return 1; } final List argsList = new LinkedList<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org