From e0bb867c3fa638c9f689ee0b044b400481cf02b5 Mon Sep 17 00:00:00 2001 From: Xuan Date: Tue, 28 Feb 2017 11:04:56 -0800 Subject: [PATCH] YARN-6189: Improve application status log message when RM restarted when app is in NEW state. Contributed by Junping Du --- .../server/resourcemanager/ClientRMService.java | 15 ++++++++++----- .../resourcemanager/TestClientRMService.java | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) 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 48bccfb16a..929a9e7b67 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 @@ -359,7 +359,8 @@ public GetApplicationReportResponse getApplicationReport( // 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(), @@ -393,7 +394,8 @@ public GetApplicationAttemptReportResponse getApplicationAttemptReport( // 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(), @@ -432,7 +434,8 @@ public GetApplicationAttemptsResponse getApplicationAttempts( // 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); @@ -480,7 +483,8 @@ public GetContainerReportResponse getContainerReport( // 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); @@ -530,7 +534,8 @@ public GetContainersResponse getContainers(GetContainersRequest request) // 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); 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 d5f9accd34..9076ac3fc1 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 @@ -283,7 +283,8 @@ public void testNonExistingApplicationReport() throws YarnException { } 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."); } }