From 0cd6f12410eca77c093779f6b01102eacf32788a Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Mon, 31 Mar 2014 18:07:08 +0000 Subject: [PATCH] HDFS-6173. Merge r1583384 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583385 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../OfflineImageViewerPB.java | 23 ++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a537ed237e4..bf4b549167d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -48,6 +48,9 @@ Release 2.5.0 - UNRELEASED HDFS-6156. Simplify the JMX API that provides snapshot information. (wheat9) + HDFS-6173. Move the default processor from Ls to Web in OfflineImageViewer. + (Akira Ajisaka via wheat9) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java index c38837fcdc8..8f3906e7e6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java @@ -70,13 +70,14 @@ public class OfflineImageViewerPB { + "\n" + "Required command line arguments:\n" + "-i,--inputFile FSImage file to process.\n" - + "-o,--outputFile Name of output file. If the specified\n" - + " file exists, it will be overwritten.\n" + "\n" + "Optional command line arguments:\n" + + "-o,--outputFile Name of output file. If the specified\n" + + " file exists, it will be overwritten.\n" + + " (output to stdout by default)\n" + "-p,--processor Select which type of processor to apply\n" - + " against image file." - + " (Ls|XML|FileDistribution).\n" + + " against image file. (XML|FileDistribution|Web)\n" + + " (Web by default)\n" + "-h,--help Display usage information and exit\n"; /** @@ -87,16 +88,12 @@ public class OfflineImageViewerPB { // Build in/output file arguments, which are required, but there is no // addOption method that can specify this - OptionBuilder.isRequired(); - OptionBuilder.hasArgs(); - OptionBuilder.withLongOpt("outputFile"); - options.addOption(OptionBuilder.create("o")); - OptionBuilder.isRequired(); OptionBuilder.hasArgs(); OptionBuilder.withLongOpt("inputFile"); options.addOption(OptionBuilder.create("i")); + options.addOption("o", "outputFile", true, ""); options.addOption("p", "processor", true, ""); options.addOption("h", "help", false, ""); options.addOption("maxSize", true, ""); @@ -144,11 +141,11 @@ public class OfflineImageViewerPB { } String inputFile = cmd.getOptionValue("i"); - String processor = cmd.getOptionValue("p", "Ls"); - String outputFile = cmd.getOptionValue("o"); + String processor = cmd.getOptionValue("p", "Web"); + String outputFile = cmd.getOptionValue("o", "-"); - PrintWriter out = (outputFile == null || outputFile.equals("-")) ? new PrintWriter( - System.out) : new PrintWriter(new File(outputFile)); + PrintWriter out = outputFile.equals("-") ? + new PrintWriter(System.out) : new PrintWriter(new File(outputFile)); Configuration conf = new Configuration(); try {