Browse Source

YARN-2540. FairScheduler: Queue filters not working on scheduler page in RM UI. (Ashwin Shankar via kasha)

(cherry picked from commit 23e17ce0ffba11a08c033b753573a756532cd1c2)
Karthik Kambatla 10 năm trước cách đây
mục cha
commit
24a814771e

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -384,6 +384,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
 

+ 3 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java

@@ -207,9 +207,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();",