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

YARN 2163. WebUI: Order of AppId in apps table should be consistent with ApplicationId.compareTo() 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605965 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ravi Prakash 2014-06-27 06:45:57 +00:00
parent 816b152c4a
commit b2e3e76e2f
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,6 +278,9 @@ Release 2.5.0 - UNRELEASED
YARN-2204. TestAMRestart#testAMRestartWithExistingContainers assumes YARN-2204. TestAMRestart#testAMRestartWithExistingContainers assumes
CapacityScheduler. (Robert Kanter via kasha) CapacityScheduler. (Robert Kanter via kasha)
YARN-2163. WebUI: Order of AppId in apps table should be consistent with
ApplicationId.compareTo(). (Wangda Tan via raviprak)
Release 2.4.1 - 2014-06-23 Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
View File

@ -119,13 +119,7 @@ function parseHadoopID(data, type, full) {
return data; return data;
} }
//Return the visible string rather than the entire HTML tag //Return the visible string rather than the entire HTML tag
if (type === 'filter') {
return data.split('>')[1].split('<')[0]; return data.split('>')[1].split('<')[0];
}
//Parse the ID for 'sort', 'type' and undefined
//The number after the last '_' and before the end tag '<'
var splits = data.split('_');
return splits[parseInt(splits.length-1)].split('<')[0];
} }
//JSON array element is "20000 attempt_1360183373897_0001_m_000002_0" //JSON array element is "20000 attempt_1360183373897_0001_m_000002_0"

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

@ -77,7 +77,7 @@ public class RmView extends TwoColumnLayout {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
return sb return sb
.append("[\n") .append("[\n")
.append("{'sType':'numeric', 'aTargets': [0]") .append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }") .append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [5, 6]") .append("\n, {'sType':'numeric', 'aTargets': [5, 6]")