diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java index 0b57717c29..a5d98383b2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java @@ -127,9 +127,12 @@ public ApplicationReport getApplication(ApplicationId appId) ApplicationReportExt app = generateApplicationReport(entity, ApplicationReportField.ALL); apps.put(app.appReport.getApplicationId(), app.appReport); + } catch (AuthorizationException e){ + LOG.debug("Failed to authorize when generating application report for {}: {}", + entity.getEntityId(), e.toString()); } catch (Exception e) { - LOG.error("Error on generating application report for " + - entity.getEntityId(), e); + LOG.error("Error on generating application report for {}: {}", + entity.getEntityId(), e.toString()); } } } @@ -681,17 +684,10 @@ private ApplicationReportExt generateApplicationReport(TimelineEntity entity, app.appReport.setTrackingUrl(appAttempt.getTrackingUrl()); app.appReport.setOriginalTrackingUrl(appAttempt.getOriginalTrackingUrl()); } - } catch (AuthorizationException | ApplicationAttemptNotFoundException e) { - // AuthorizationException is thrown because the user doesn't have access - if (e instanceof AuthorizationException) { - LOG.warn("Failed to authorize when generating application report for " - + app.appReport.getApplicationId() - + ". Use a placeholder for its latest attempt id. ", e); - } else { // Attempt not found - LOG.info("No application attempt found for " - + app.appReport.getApplicationId() - + ". Use a placeholder for its latest attempt id. ", e); - } + } catch (ApplicationAttemptNotFoundException e) { + LOG.info("No application attempt found for " + + app.appReport.getApplicationId() + + ". Use a placeholder for its latest attempt id. ", e); // It's possible that the app is finished before the first attempt is created. app.appReport.setDiagnostics(null); app.appReport.setCurrentApplicationAttemptId(null);