YARN-5524. Yarn live log aggregation does not throw if command line arg is wrong. Contributed by Xuan Gong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35834139 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35834139 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35834139 Branch: refs/heads/YARN-5734 Commit: 358341398adfe8f59bb2165472b50751de3ffb98 Parents: ef2dd7b Author: Naganarasimha <naganarasimha...@apache.org> Authored: Tue Dec 20 06:36:25 2016 +0530 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Tue Dec 20 06:36:25 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/client/cli/LogsCLI.java | 2 +- .../apache/hadoop/yarn/client/cli/TestLogsCLI.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/35834139/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index 9b21ff8..a9ca96c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -138,7 +138,7 @@ public class LogsCLI extends Configured implements Tool { String localDir = null; long bytes = Long.MAX_VALUE; try { - CommandLine commandLine = parser.parse(opts, args, true); + CommandLine commandLine = parser.parse(opts, args, false); appIdStr = commandLine.getOptionValue(APPLICATION_ID_OPTION); containerIdStr = commandLine.getOptionValue(CONTAINER_ID_OPTION); nodeAddress = commandLine.getOptionValue(NODE_ADDRESS_OPTION); http://git-wip-us.apache.org/repos/asf/hadoop/blob/35834139/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java index a564f6f..ef164a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java @@ -126,6 +126,21 @@ public class TestLogsCLI { assertTrue("Should return an error code", exitCode != 0); } + @Test(timeout = 1000l) + public void testInvalidOpts() throws Exception { + Configuration conf = new YarnConfiguration(); + YarnClient mockYarnClient = createMockYarnClient( + YarnApplicationState.FINISHED, + UserGroupInformation.getCurrentUser().getShortUserName()); + LogsCLI cli = new LogsCLIForTest(mockYarnClient); + cli.setConf(conf); + + int exitCode = cli.run( new String[] { "-InvalidOpts"}); + assertTrue(exitCode == -1); + assertTrue(sysErrStream.toString().contains( + "options parsing failed: Unrecognized option: -InvalidOpts")); + } + @Test(timeout = 5000l) public void testInvalidApplicationId() throws Exception { Configuration conf = new YarnConfiguration(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org