YARN-2540. FairScheduler: Queue filters not working on scheduler page in RM UI. (Ashwin Shankar via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/23e17ce0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/23e17ce0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/23e17ce0 Branch: refs/heads/HDFS-6581 Commit: 23e17ce0ffba11a08c033b753573a756532cd1c2 Parents: 912ad32 Author: Karthik Kambatla <ka...@apache.org> Authored: Mon Sep 22 15:40:47 2014 -0700 Committer: Karthik Kambatla <ka...@apache.org> Committed: Mon Sep 22 15:40:47 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/webapp/FairSchedulerPage.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/23e17ce0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7e5d0f9..e5e397e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -414,6 +414,9 @@ Release 2.6.0 - UNRELEASED YARN-2453. TestProportionalCapacityPreemptionPolicy fails with FairScheduler. (Zhihai Xu via kasha) + + YARN-2540. FairScheduler: Queue filters not working on scheduler page in + RM UI. (Ashwin Shankar via kasha) Release 2.5.1 - 2014-09-05 http://git-wip-us.apache.org/repos/asf/hadoop/blob/23e17ce0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.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/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index bcf7781..8c54f4e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -220,9 +220,9 @@ public class FairSchedulerPage extends RmView { " }", " });", " $('#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) + '$';", + " var queues = $('.q', data.rslt.obj);", + " var q = '^' + queues.first().text();", + " q += queues.length == 1 ? '$' : '\\\\.';", " $('#apps').dataTable().fnFilter(q, 4, true);", " });", " $('#cs').show();",
