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/02 01:45:01 UTC
hadoop git commit: Revert "YARN-3430. Made headroom data available on
app attempt page of RM WebUI. Contributed by Xuan Gong."
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 e4059b9cc -> cf33bc105
Revert "YARN-3430. Made headroom data available on app attempt page of RM WebUI. Contributed by Xuan Gong."
This reverts commit e4059b9cce2703c412abeacc08225c3cdfe415c1.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf33bc10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf33bc10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf33bc10
Branch: refs/heads/branch-2.7
Commit: cf33bc1050c32a40b861e3031d27befed51e4938
Parents: e4059b9
Author: Zhijie Shen <zj...@apache.org>
Authored: Wed Apr 1 16:41:25 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Wed Apr 1 16:41:25 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 ---
.../yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java | 4 +---
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf33bc10/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c0ba029..c40da6d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -745,9 +745,6 @@ 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/cf33bc10/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 b519581..419c0ce 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,12 +156,10 @@ 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 : ", metrics == null ? "N/A" :
- metrics.getApplicationAttemptHeadroom());
+ "Application Attempt Headroom : ", 0);
pdiv._();
}
}