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

YARN-3171. Sort by Application id, AppAttempt and ContainerID doesn't 

work in ATS / RM web ui. Contributed by Naganarasimha G R

(cherry picked from commit 3ff1ba2a7b)
(cherry picked from commit b6eb36dbdc)
This commit is contained in:
Xuan 2015-03-15 20:26:10 -07:00 committed by Vinod Kumar Vavilapalli
parent f4154bdee8
commit 85ec6eb37a
2 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

@ -208,6 +208,9 @@ Release 2.6.1 - 2015-09-09
YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM
web page. (Xuan Gong via zjshen) web page. (Xuan Gong via zjshen)
YARN-3171. Sort by Application id, AppAttempt and ContainerID doesn't work
in ATS / RM web ui. (Naganarasimha G R via xgong)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -44,7 +44,7 @@ public class WebPageUtils {
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': " + .append("\n, {'sType':'numeric', 'aTargets': " +
(isFairSchedulerPage ? "[6, 7]": "[5, 6]")) (isFairSchedulerPage ? "[6, 7]": "[5, 6]"))
@ -63,7 +63,7 @@ public class WebPageUtils {
private static String getAttemptsTableColumnDefs() { private static String getAttemptsTableColumnDefs() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
return sb.append("[\n").append("{'sType':'numeric', 'aTargets': [0]") return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }") .append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [1]") .append("\n, {'sType':'numeric', 'aTargets': [1]")
.append(", 'mRender': renderHadoopDate }]").toString(); .append(", 'mRender': renderHadoopDate }]").toString();
@ -79,7 +79,7 @@ public class WebPageUtils {
private static String getContainersTableColumnDefs() { private static String getContainersTableColumnDefs() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
return sb.append("[\n").append("{'sType':'numeric', 'aTargets': [0]") return sb.append("[\n").append("{'sType':'string', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }]").toString(); .append(", 'mRender': parseHadoopID }]").toString();
} }