Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3707. RM Web UI queue filter doesn't work. Contributed by Wangda Tan 

(cherry picked from commit 446d51591e)
This commit is contained in:
Jian He 2015-05-22 15:58:22 -07:00
parent 33be070a5e
commit 03af057a47
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -390,6 +390,8 @@ Release 2.8.0 - UNRELEASED
YARN-3654. ContainerLogsPage web UI should not have meta-refresh. (Xuan Gong YARN-3654. ContainerLogsPage web UI should not have meta-refresh. (Xuan Gong
via jianhe) via jianhe)
YARN-3707. RM Web UI queue filter doesn't work. (Wangda Tan via jianhe)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
View File

@ -350,7 +350,7 @@ class CapacitySchedulerPage extends RmView {
a(_Q).$style(width(Q_MAX_WIDTH)). a(_Q).$style(width(Q_MAX_WIDTH)).
span().$style(join(width(used), ";left:0%;", span().$style(join(width(used), ";left:0%;",
used > 1 ? Q_OVER : Q_UNDER))._(".")._(). used > 1 ? Q_OVER : Q_UNDER))._(".")._().
span(".q", "root")._(). span(".q", "Queue: root")._().
span().$class("qstats").$style(left(Q_STATS_POS)). span().$class("qstats").$style(left(Q_STATS_POS)).
_(join(percent(used), " used"))._(). _(join(percent(used), " used"))._().
_(QueueBlock.class)._(); _(QueueBlock.class)._();
@ -514,8 +514,8 @@ class CapacitySchedulerPage extends RmView {
" });", " });",
" $('#cs').bind('select_node.jstree', function(e, data) {", " $('#cs').bind('select_node.jstree', function(e, data) {",
" var q = $('.q', data.rslt.obj).first().text();", " var q = $('.q', data.rslt.obj).first().text();",
" if (q == 'root') q = '';", " if (q == 'Queue: root') q = '';",
" else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';", " else q = '^' + q.substr(q.lastIndexOf(':') + 2) + '$';",
" $('#apps').dataTable().fnFilter(q, 4, true);", " $('#apps').dataTable().fnFilter(q, 4, true);",
" });", " });",
" $('#cs').show();", " $('#cs').show();",