Repository: hadoop Updated Branches: refs/heads/branch-2 df35ba81f -> 95bd3c3d5
YARN-6189: Improve application status log message when RM restarted when app is in NEW state. Contributed by Junping Du (cherry picked from commit e0bb867c3fa638c9f689ee0b044b400481cf02b5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95bd3c3d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95bd3c3d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95bd3c3d Branch: refs/heads/branch-2 Commit: 95bd3c3d55625c732299dbf35d32f7690caee829 Parents: df35ba8 Author: Xuan <[email protected]> Authored: Tue Feb 28 11:04:56 2017 -0800 Committer: Xuan <[email protected]> Committed: Tue Feb 28 11:06:07 2017 -0800 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/ClientRMService.java | 15 ++++++++++----- .../server/resourcemanager/TestClientRMService.java | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/95bd3c3d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 10745a9..e468813 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -357,7 +357,8 @@ public class ClientRMService extends AbstractService implements // If the RM doesn't have the application, throw // ApplicationNotFoundException and let client to handle. throw new ApplicationNotFoundException("Application with id '" - + applicationId + "' doesn't exist in RM."); + + applicationId + "' doesn't exist in RM. Please check " + + "that the job submission was successful."); } boolean allowAccess = checkAccess(callerUGI, application.getUser(), @@ -391,7 +392,8 @@ public class ClientRMService extends AbstractService implements // ApplicationNotFoundException and let client to handle. throw new ApplicationNotFoundException("Application with id '" + request.getApplicationAttemptId().getApplicationId() - + "' doesn't exist in RM."); + + "' doesn't exist in RM. Please check that the job " + + "submission was successful."); } boolean allowAccess = checkAccess(callerUGI, application.getUser(), @@ -430,7 +432,8 @@ public class ClientRMService extends AbstractService implements // If the RM doesn't have the application, throw // ApplicationNotFoundException and let client to handle. throw new ApplicationNotFoundException("Application with id '" + appId - + "' doesn't exist in RM."); + + "' doesn't exist in RM. Please check that the job submission " + + "was successful."); } boolean allowAccess = checkAccess(callerUGI, application.getUser(), ApplicationAccessType.VIEW_APP, application); @@ -478,7 +481,8 @@ public class ClientRMService extends AbstractService implements // If the RM doesn't have the application, throw // ApplicationNotFoundException and let client to handle. throw new ApplicationNotFoundException("Application with id '" + appId - + "' doesn't exist in RM."); + + "' doesn't exist in RM. Please check that the job submission " + + "was successful."); } boolean allowAccess = checkAccess(callerUGI, application.getUser(), ApplicationAccessType.VIEW_APP, application); @@ -528,7 +532,8 @@ public class ClientRMService extends AbstractService implements // If the RM doesn't have the application, throw // ApplicationNotFoundException and let client to handle. throw new ApplicationNotFoundException("Application with id '" + appId - + "' doesn't exist in RM."); + + "' doesn't exist in RM. Please check that the job submission " + + "was successful."); } boolean allowAccess = checkAccess(callerUGI, application.getUser(), ApplicationAccessType.VIEW_APP, application); http://git-wip-us.apache.org/repos/asf/hadoop/blob/95bd3c3d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 474aee8..1b1b860 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -277,7 +277,8 @@ public class TestClientRMService { } catch (ApplicationNotFoundException ex) { Assert.assertEquals(ex.getMessage(), "Application with id '" + request.getApplicationId() - + "' doesn't exist in RM."); + + "' doesn't exist in RM. Please check that the " + + "job submission was successful."); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
