You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ra...@apache.org on 2014/06/27 08:43:47 UTC
svn commit: r1605964 - in /hadoop/common/trunk/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resou...
Author: raviprak
Date: Fri Jun 27 06:43:46 2014
New Revision: 1605964
URL: http://svn.apache.org/r1605964
Log:
YARN 2163. WebUI: Order of AppId in apps table should be consistent with ApplicationId.compareTo()
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1605964&r1=1605963&r2=1605964&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Fri Jun 27 06:43:46 2014
@@ -293,6 +293,9 @@ Release 2.5.0 - UNRELEASED
YARN-2204. TestAMRestart#testAMRestartWithExistingContainers assumes
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
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js?rev=1605964&r1=1605963&r2=1605964&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js Fri Jun 27 06:43:46 2014
@@ -119,13 +119,7 @@ function parseHadoopID(data, type, full)
return data;
}
//Return the visible string rather than the entire HTML tag
- if (type === 'filter') {
- 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];
+ return data.split('>')[1].split('<')[0];
}
//JSON array element is "20000 attempt_1360183373897_0001_m_000002_0"
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java?rev=1605964&r1=1605963&r2=1605964&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java Fri Jun 27 06:43:46 2014
@@ -77,7 +77,7 @@ public class RmView extends TwoColumnLay
StringBuilder sb = new StringBuilder();
return sb
.append("[\n")
- .append("{'sType':'numeric', 'aTargets': [0]")
+ .append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [5, 6]")