rename threads option.

Author: wanghongbing

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java

@@ -107,7 +107,7 @@ public class OfflineImageViewerPB {
       + "                       Delimited outputs. If not set, the processor\n"
       + "                       constructs the namespace in memory \n"
       + "                       before outputting text.\n"
-      + "-threads <args>        Use multiple threads to process sub-sections.\n"
+      + "-m,--multiThread <arg> Use multiThread to process sub-sections.\n"
       + "-h,--help              Display usage information and exit\n";
 
   /**
@@ -133,7 +133,7 @@ private static Options buildOptions() {
     options.addOption("delimiter", true, "");
     options.addOption("sp", false, "");
     options.addOption("t", "temp", true, "");
-    options.addOption("threads", true, "");
+    options.addOption("m", "multiThread", true, "");
 
     return options;
   }
@@ -187,7 +187,7 @@ public static int run(String[] args) throws Exception {
     String delimiter = cmd.getOptionValue("delimiter",
         PBImageTextWriter.DEFAULT_DELIMITER);
     String tempPath = cmd.getOptionValue("t", "");
-    int threads = Integer.parseInt(cmd.getOptionValue("threads", "1"));
+    int threads = Integer.parseInt(cmd.getOptionValue("m", "1"));
 
     Configuration conf = new Configuration();
     PrintStream out = null;

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageTextWriter.java

@@ -703,7 +703,6 @@ private void outputInSerial(Configuration conf, FileSummary summary,
    * STEP1: Multi-threaded process sub-sections.
    * Given n (n>1) threads to process k (k>=n) sections,
    * output parsed results of each section to tmp file in order.
-   * 
    * STEP2: Merge tmp files.
    */
   private void outputInParallel(Configuration conf, FileSummary summary,

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java

@@ -936,16 +936,16 @@ private void testPBDelimitedWriter(String db)
   }
 
   private void testParallelPBDelimitedWriter(String db) throws Exception{
-    String delemiter = "\t";
+    String delimiter = "\t";
     int numThreads = 4;
 
     File parallelDelimitedOut = new File(tempDir, "parallelDelimitedOut");
     if (OfflineImageViewerPB.run(new String[] {"-p", "Delimited",
         "-i", originalFsimage.getAbsolutePath(),
         "-o", parallelDelimitedOut.getAbsolutePath(),
-        "-delimiter", delemiter,
+        "-delimiter", delimiter,
         "-t", db,
-        "-threads", String.valueOf(numThreads)}) != 0) {
+        "-m", String.valueOf(numThreads)}) != 0) {
       throw new IOException("oiv returned failure outputting in parallel.");
     }
     MD5Hash parallelMd5 = MD5FileUtils.computeMd5ForFile(parallelDelimitedOut);
@@ -958,7 +958,7 @@ private void testParallelPBDelimitedWriter(String db) throws Exception{
         "-i", originalFsimage.getAbsolutePath(),
         "-o", serialDelimitedOut.getAbsolutePath(),
         "-t", db,
-        "-delimiter", delemiter}) != 0) {
+        "-delimiter", delimiter}) != 0) {
       throw new IOException("oiv returned failure outputting in serial.");
     }
     MD5Hash serialMd5 = MD5FileUtils.computeMd5ForFile(serialDelimitedOut);