YARN-3430. Made headroom data available on app attempt page of RM Web…

…UI. Contributed by Xuan Gong.
apache · Apr 1, 2015 · 8366a36 · 8366a36
1 parent ed72daa
commit 8366a36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
@@ -870,6 +870,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

diff --git a/...src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java b/...src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
@@ -166,10 +166,12 @@ protected void createAttemptHeadRoomTable(Block html) {
  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._();
  }
  }