hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjs...@apache.org
Subject hadoop git commit: YARN-3430. Made headroom data available on app attempt page of RM WebUI. Contributed by Xuan Gong.
Date Wed, 01 Apr 2015 20:49:16 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 b17d8a53f -> 6d0bebc91


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/6d0bebc9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d0bebc9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d0bebc9

Branch: refs/heads/branch-2
Commit: 6d0bebc9121de6e448a083348c3f8250d5c80ba4
Parents: b17d8a5
Author: Zhijie Shen <zjshen@apache.org>
Authored: Wed Apr 1 13:47:54 2015 -0700
Committer: Zhijie Shen <zjshen@apache.org>
Committed: Wed Apr 1 13:49:00 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/6d0bebc9/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a7fb336..fee7253 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -825,6 +825,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/6d0bebc9/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 1861874..1831920 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
@@ -166,10 +166,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._();
       }
     }


Mime
View raw message