Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10783. The option '-maxSize' and '-step' fail in OfflineImageViewer. Contributed by Yiqun Lin. 

(cherry picked from commit e90f3359de)
(cherry picked from commit 94a844b4f6)
This commit is contained in:
Akira Ajisaka 2016-08-23 19:56:27 +09:00
parent 71a3b01d51
commit dde3eaed62
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
View File

@ -186,6 +186,8 @@ public class OfflineImageViewer {
options.addOption("p", "processor", true, ""); options.addOption("p", "processor", true, "");
options.addOption("h", "help", false, ""); options.addOption("h", "help", false, "");
options.addOption("maxSize", true, "");
options.addOption("step", true, "");
options.addOption("skipBlocks", false, ""); options.addOption("skipBlocks", false, "");
options.addOption("printToScreen", false, ""); options.addOption("printToScreen", false, "");
options.addOption("delimiter", true, ""); options.addOption("delimiter", true, "");

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

@ -601,4 +601,23 @@ public class TestOfflineImageViewer {
"FileDistribution", "-maxSize", "23", "-step", "4"}); "FileDistribution", "-maxSize", "23", "-step", "4"});
assertEquals(0, status); assertEquals(0, status);
} }
@Test
public void testOfflineImageViewerMaxSizeAndStepOptions() throws Exception {
final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
final PrintStream out = new PrintStream(bytes);
final PrintStream oldOut = System.out;
try {
System.setOut(out);
// Add the -h option to make the test only for option parsing,
// and don't need to do the following operations.
OfflineImageViewer.main(new String[] {"-i", "-", "-o", "-", "-p",
"FileDistribution", "-maxSize", "512", "-step", "8", "-h"});
Assert.assertFalse(bytes.toString().contains(
"Error parsing command-line options: "));
} finally {
System.setOut(oldOut);
IOUtils.closeStream(out);
}
}
} }