Repository: hadoop Updated Branches: refs/heads/branch-2.8 07623aa94 -> 475a277e6
YARN-4748. ApplicationHistoryManagerOnTimelineStore should not swallow exceptions on generateApplicationReport. Contributed by Li Lu (cherry picked from commit d93c22ec274b1a0f29609217039b80732886fed7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/475a277e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/475a277e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/475a277e Branch: refs/heads/branch-2.8 Commit: 475a277e6025d913b73a0a48b0476a02d998fadb Parents: 07623aa Author: Jian He <jia...@apache.org> Authored: Mon Feb 29 18:19:09 2016 -0800 Committer: Jian He <jia...@apache.org> Committed: Mon Feb 29 18:19:49 2016 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../ApplicationHistoryManagerOnTimelineStore.java | 9 +++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/475a277e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index bc4fb4c..00b2040 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1228,6 +1228,9 @@ Release 2.8.0 - UNRELEASED YARN-4709. NMWebServices produces incorrect JSON for containers. (Varun Saxena via vvasudev) + YARN-4748. ApplicationHistoryManagerOnTimelineStore should not + swallow exceptions on generateApplicationReport. (Li Lu via jianhe) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/475a277e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java ---------------------------------------------------------------------- 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 6e6b9fc..fd11aea 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 @@ -625,6 +625,15 @@ public class ApplicationHistoryManagerOnTimelineStore extends AbstractService } } 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); + } // It's possible that the app is finished before the first attempt is created. app.appReport.setDiagnostics(null); app.appReport.setCurrentApplicationAttemptId(null);
