From 446d51591e6e99cc60a85c4b9fbac379a8caa49d Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 22 May 2015 15:58:22 -0700 Subject: [PATCH] YARN-3707. RM Web UI queue filter doesn't work. Contributed by Wangda Tan --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../resourcemanager/webapp/CapacitySchedulerPage.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d7edbf2aec7..0c3a36838ce 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -435,6 +435,8 @@ Release 2.8.0 - UNRELEASED YARN-3654. ContainerLogsPage web UI should not have meta-refresh. (Xuan Gong via jianhe) + YARN-3707. RM Web UI queue filter doesn't work. (Wangda Tan via jianhe) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES 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/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index 255150eaa23..a784601bbf3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -350,7 +350,7 @@ public void render(Block html) { a(_Q).$style(width(Q_MAX_WIDTH)). span().$style(join(width(used), ";left:0%;", used > 1 ? Q_OVER : Q_UNDER))._(".")._(). - span(".q", "root")._(). + span(".q", "Queue: root")._(). span().$class("qstats").$style(left(Q_STATS_POS)). _(join(percent(used), " used"))._(). _(QueueBlock.class)._(); @@ -514,8 +514,8 @@ public void render(HtmlBlock.Block html) { " });", " $('#cs').bind('select_node.jstree', function(e, data) {", " var q = $('.q', data.rslt.obj).first().text();", - " if (q == 'root') q = '';", - " else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';", + " if (q == 'Queue: root') q = '';", + " else q = '^' + q.substr(q.lastIndexOf(':') + 2) + '$';", " $('#apps').dataTable().fnFilter(q, 4, true);", " });", " $('#cs').show();",