hadoop git commit: YARN-3707. RM Web UI queue filter doesn't work. Contributed by Wangda Tan (cherry picked from commit 446d51591e6e99cc60a85c4b9fbac379a8caa49d) (cherry picked from commit 03af057a477b2a31b66831d66f8a38cff42f2201)

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 5220d4dc2 -> 993801026


YARN-3707. RM Web UI queue filter doesn't work. Contributed by Wangda Tan
(cherry picked from commit 446d51591e6e99cc60a85c4b9fbac379a8caa49d)
(cherry picked from commit 03af057a477b2a31b66831d66f8a38cff42f2201)

Conflicts:

        hadoop-yarn-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99380102
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99380102
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99380102

Branch: refs/heads/branch-2.7
Commit: 99380102642da6ced784ed705a5c21d3e7be5c4c
Parents: 5220d4d
Author: Jason Lowe <jl...@apache.org>
Authored: Thu Jul 21 18:17:29 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Thu Jul 21 18:17:29 2016 +0000

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                | 2 ++
 .../server/resourcemanager/webapp/CapacitySchedulerPage.java   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/99380102/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4a001fd..a5f0445 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -21,6 +21,8 @@ Release 2.7.4 - UNRELEASED
     YARN-5353. ResourceManager can leak delegation tokens when they are shared 
across
     apps. (Jason Lowe via Varun Saxena)
 
+    YARN-3707. RM Web UI queue filter doesn't work. (Wangda Tan via jianhe)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/99380102/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.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/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 a7a1f18..cf4dc1f 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
@@ -303,7 +303,7 @@ class CapacitySchedulerPage extends RmView {
             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)._();
@@ -377,8 +377,8 @@ class CapacitySchedulerPage 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) + '$';",
+          "    if (q == 'Queue: root') q = '';",
+          "    else q = '^' + q.substr(q.lastIndexOf(':') + 2) + '$';",
           "    $('#apps').dataTable().fnFilter(q, 4, true);",
           "  });",
           "  $('#cs').show();",


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org