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

Browse Source 
(cherry picked from commit 446d51591e6e99cc60a85c4b9fbac379a8caa49d)
(cherry picked from commit 03af057a477b2a31b66831d66f8a38cff42f2201)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Jason Lowe 2016-07-21 18:17:29 +00:00
parent 5220d4dc27
commit 9938010264
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

@ -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

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

@ -303,7 +303,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)._();
@ -377,8 +377,8 @@ public void render(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();",