From 75747321b734980321a39200ecade21b830b2619 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Mon, 3 Jun 2013 23:50:54 +0000 Subject: [PATCH] Merge -c 1489234 from trunk to branch-2 to fix YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. Contributed by Mayank Bansal. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489235 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/resourcemanager/webapp/RmView.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 664972d7c16..0912a9ef8c4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -395,6 +395,9 @@ Release 2.1.0-beta - UNRELEASED YARN-730. Fix NMClientAsync to remove completed containers. (Zhijie Shen via acmurthy) + YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. + (Mayank Bansal via acmurthy) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS YARN-158. Yarn creating package-info.java must not depend on sh. 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/RmView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java index 59c62ffbe6c..1f3de367e14 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java @@ -80,10 +80,10 @@ public class RmView extends TwoColumnLayout { .append("{'sType':'numeric', 'aTargets': [0]") .append(", 'mRender': parseHadoopID }") - .append("\n, {'sType':'numeric', 'aTargets': [4, 5]") + .append("\n, {'sType':'numeric', 'aTargets': [5, 6]") .append(", 'mRender': renderHadoopDate }") - .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [8]") + .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9]") .append(", 'mRender': parseHadoopProgress }]").toString(); } }