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)
This commit is contained in:
Xuan 2015-03-15 20:26:10 -07:00
parent f9c18fd610
commit 6ee45ae3a8
2 changed files with 6 additions and 3 deletions

View File

@ -706,6 +706,9 @@ Release 2.7.0 - UNRELEASED
YARN-3267. Timelineserver applies the ACL rules after applying the limit on YARN-3267. Timelineserver applies the ACL rules after applying the limit on
the number of records (Chang Li via jeagles) the number of records (Chang Li via jeagles)
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

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();
} }