Repository: hadoop Updated Branches: refs/heads/branch-3.0 7b49de5e3 -> f8df655f3
HDFS-12530. Processor argument in Offline Image Viewer should be case insensitive. Contributed by Hanisha Koneru. (cherry picked from commit 08fca508e66e8eddc5d8fd1608ec0c9cd54fc990) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f8df655f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f8df655f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f8df655f Branch: refs/heads/branch-3.0 Commit: f8df655f315d517a62e75962718da8bb30c3c0ec Parents: 7b49de5 Author: Arpit Agarwal <a...@apache.org> Authored: Fri Sep 22 09:47:57 2017 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Thu Sep 28 10:18:22 2017 -0700 ---------------------------------------------------------------------- .../tools/offlineImageViewer/OfflineImageViewerPB.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f8df655f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java ---------------------------------------------------------------------- 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 c1141f3..0f2ac81 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 @@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.util.StringUtils; /** * OfflineImageViewerPB to dump the contents of an Hadoop image file to XML or @@ -174,8 +175,8 @@ public class OfflineImageViewerPB { Configuration conf = new Configuration(); try (PrintStream out = outputFile.equals("-") ? System.out : new PrintStream(outputFile, "UTF-8")) { - switch (processor) { - case "FileDistribution": + switch (StringUtils.toUpperCase(processor)) { + case "FILEDISTRIBUTION": long maxSize = Long.parseLong(cmd.getOptionValue("maxSize", "0")); int step = Integer.parseInt(cmd.getOptionValue("step", "0")); boolean formatOutput = cmd.hasOption("format"); @@ -186,7 +187,7 @@ public class OfflineImageViewerPB { new PBImageXmlWriter(conf, out).visit(new RandomAccessFile(inputFile, "r")); break; - case "ReverseXML": + case "REVERSEXML": try { OfflineImageReconstructor.run(inputFile, outputFile); } catch (Exception e) { @@ -196,14 +197,14 @@ public class OfflineImageViewerPB { System.exit(1); } break; - case "Web": + case "WEB": String addr = cmd.getOptionValue("addr", "localhost:5978"); try (WebImageViewer viewer = new WebImageViewer(NetUtils.createSocketAddr(addr))) { viewer.start(inputFile); } break; - case "Delimited": + case "DELIMITED": try (PBImageDelimitedTextWriter writer = new PBImageDelimitedTextWriter(out, delimiter, tempPath)) { writer.visit(new RandomAccessFile(inputFile, "r")); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org