You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/04/06 23:17:41 UTC
[2/2] hadoop git commit: YARN-3430. Made headroom data available on
app attempt page of RM WebUI. Contributed by Xuan Gong.
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/64cf0798
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/64cf0798
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/64cf0798
Branch: refs/heads/branch-2.7
Commit: 64cf079858a2fe21187b4f097f1776479ef8f16a
Parents: edc3cb7
Author: Zhijie Shen <zj...@apache.org>
Authored: Wed Apr 1 13:47:54 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Apr 6 13:18:16 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/64cf0798/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8d4d8b8..28b33ff 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -748,6 +748,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/64cf0798/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._();
}
}