Repository: hadoop Updated Branches: refs/heads/branch-2 2dbd86bcf -> 282a56243 refs/heads/trunk 2d4731c06 -> 754f15bae
HDFS-11226. cacheadmin, cryptoadmin and storagepolicyadmin should support generic options. Contributed by Brahma Reddy Battula (cherry picked from commit e91494c27a0b9a4a456d92fe7d632a608c4f11f3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/282a5624 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/282a5624 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/282a5624 Branch: refs/heads/branch-2 Commit: 282a562437571556d375bbe316523373b89fbd29 Parents: 2dbd86b Author: Mingliang Liu <lium...@apache.org> Authored: Mon Dec 12 17:36:52 2016 -0800 Committer: Mingliang Liu <lium...@apache.org> Committed: Mon Dec 12 18:17:54 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/282a5624/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<String> argsList = new LinkedList<String>(); @@ -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/282a5624/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<String> argsList = new LinkedList<String>(); @@ -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/282a5624/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<String> argsList = new LinkedList<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org