Repository: hadoop Updated Branches: refs/heads/branch-2.7 aa326086c -> e4059b9cc
YARN-3430. Made headroom data available on app attempt page of RM WebUI. Contributed by Xuan Gong. (cherry picked from commit 8366a36ad356e6318b8ce6c5c96e201149f811bd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4059b9c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4059b9c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4059b9c Branch: refs/heads/branch-2.7 Commit: e4059b9cce2703c412abeacc08225c3cdfe415c1 Parents: aa32608 Author: Zhijie Shen <[email protected]> Authored: Wed Apr 1 13:47:54 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Wed Apr 1 13:49:51 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4059b9c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c40da6d..c0ba029 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -745,6 +745,9 @@ Release 2.7.0 - UNRELEASED removing inconsistencies in the default values. (Junping Du and Karthik Kambatla via vinodkv) + YARN-3430. Made headroom data available on app attempt page of RM WebUI. + (Xuan Gong via zjshen) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4059b9c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.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/webapp/RMAppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java index 419c0ce..b519581 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java @@ -156,10 +156,12 @@ public class RMAppAttemptBlock extends AppAttemptBlock{ if (attempt != null) { if (!isApplicationInFinalState(YarnApplicationAttemptState .valueOf(attempt.getAppAttemptState().toString()))) { + RMAppAttemptMetrics metrics = attempt.getRMAppAttemptMetrics(); DIV<Hamlet> pdiv = html._(InfoBlock.class).div(_INFO_WRAP); info("Application Attempt Overview").clear(); info("Application Attempt Metrics")._( - "Application Attempt Headroom : ", 0); + "Application Attempt Headroom : ", metrics == null ? "N/A" : + metrics.getApplicationAttemptHeadroom()); pdiv._(); } }
