diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index 4fdb57b..036fede 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -274,7 +274,7 @@ private void printHelpMessage(Options options) { formatter.printHelp("general options are:", options); } - private List getAMContainerInfoForRMWebService( + protected List getAMContainerInfoForRMWebService( Configuration conf, String appId) throws ClientHandlerException, UniformInterfaceException, JSONException { Client webServiceClient = Client.create(); @@ -535,6 +535,11 @@ private int printAMContainerLogs(Configuration conf, if (amContainerId <= requests.size()) { outputAMContainerLogs(requests.get(amContainerId - 1), conf, logCliHelper); + } else { + System.err.println(String.format( "ERROR: Specified AM containerId" + + " (%s) exceeds the number of AM containers (%s).", + amContainerId, requests.size())); + return -1; } } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java index db40b50..69d6f5d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java @@ -71,6 +71,7 @@ import org.apache.hadoop.yarn.logaggregation.ContainerLogsRequest; import org.apache.hadoop.yarn.logaggregation.LogAggregationUtils; import org.apache.hadoop.yarn.logaggregation.LogCLIHelpers; +import org.codehaus.jettison.json.JSONObject; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -132,6 +133,28 @@ public void testInvalidApplicationId() throws Exception { } @Test(timeout = 5000l) + public void testInvalidAMContainerId() throws Exception { + Configuration conf = new YarnConfiguration(); + conf.setBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, true); + YarnClient mockYarnClient = + createMockYarnClient(YarnApplicationState.FINISHED, + UserGroupInformation.getCurrentUser().getShortUserName()); + LogsCLI cli = spy(new LogsCLIForTest(mockYarnClient)); + List list = Arrays.asList(new JSONObject()); + doReturn(list).when(cli) + .getAMContainerInfoForRMWebService(any(Configuration.class), + any(String.class)); + cli.setConf(conf); + + int exitCode = cli.run( + new String[] { "-applicationId", "application_1465862913885_0027", + "-am", "1000" }); + assertTrue(exitCode == -1); + assertTrue(sysErrStream.toString() + .contains("exceeds the number of AM containers")); + } + + @Test(timeout = 5000l) public void testUnknownApplicationId() throws Exception { Configuration conf = new YarnConfiguration(); YarnClient mockYarnClient = createMockYarnClientUnknownApp();