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

svn merge -c 1606265 FIXES: YARN-2104. Scheduler queue filter failed to work because index of queue column changed. Contributed by Wangda Tan 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606266 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2014-06-27 23:13:14 +00:00
parent f364837694
commit dfe7cbb050
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,6 +281,9 @@ Release 2.5.0 - UNRELEASED
YARN-2163. WebUI: Order of AppId in apps table should be consistent with YARN-2163. WebUI: Order of AppId in apps table should be consistent with
ApplicationId.compareTo(). (Wangda Tan via raviprak) ApplicationId.compareTo(). (Wangda Tan via raviprak)
YARN-2104. Scheduler queue filter failed to work because index of queue
column changed. (Wangda Tan via jlowe)
Release 2.4.1 - 2014-06-23 Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
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

@ -262,7 +262,7 @@ class CapacitySchedulerPage extends RmView {
" var q = $('.q', data.rslt.obj).first().text();", " var q = $('.q', data.rslt.obj).first().text();",
" if (q == 'root') q = '';", " if (q == 'root') q = '';",
" else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';", " else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';",
" $('#apps').dataTable().fnFilter(q, 3, true);", " $('#apps').dataTable().fnFilter(q, 4, true);",
" });", " });",
" $('#cs').show();", " $('#cs').show();",
"});")._(). "});")._().

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

@ -137,7 +137,7 @@ class DefaultSchedulerPage 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 == 'root') q = '';",
" $('#apps').dataTable().fnFilter(q, 3);", " $('#apps').dataTable().fnFilter(q, 4);",
" });", " });",
" $('#cs').show();", " $('#cs').show();",
"});")._(); "});")._();

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

@ -210,7 +210,7 @@ public class FairSchedulerPage extends RmView {
" var q = $('.q', data.rslt.obj).first().text();", " var q = $('.q', data.rslt.obj).first().text();",
" if (q == 'root') q = '';", " if (q == 'root') q = '';",
" else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';", " else q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';",
" $('#apps').dataTable().fnFilter(q, 3, true);", " $('#apps').dataTable().fnFilter(q, 4, true);",
" });", " });",
" $('#cs').show();", " $('#cs').show();",
"});")._(). "});")._().