From 937d9653a76c5596fc61fbdfc95a999835a116ff Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 18 Nov 2015 17:17:58 +0000 Subject: [PATCH] MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu. (cherry picked from commit 790a861766dcd60212d83f444f2f96d3acf20a94) Conflicts: hadoop-mapreduce-project/CHANGES.txt --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 7d513a8b3c7..b80039ed2cd 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -21,6 +21,9 @@ Release 2.6.3 - UNRELEASED MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) + MAPREDUCE-6377. JHS sorting on state column not working in webUi. + (zhihai xu via devaraj) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java index 59b7aa6b479..229bbb0bc8a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java @@ -87,10 +87,11 @@ public class HsView extends TwoColumnLayout { append(", bProcessing: true"). // Sort by id upon page load - append(", aaSorting: [[2, 'desc']]"). + append(", aaSorting: [[3, 'desc']]"). append(", aoColumnDefs:["). // Maps Total, Maps Completed, Reduces Total and Reduces Completed - append("{'sType':'numeric', 'bSearchable': false, 'aTargets': [ 7, 8, 9, 10 ] }"). + append("{'sType':'numeric', 'bSearchable': false" + + ", 'aTargets': [ 8, 9, 10, 11 ] }"). append("]}"). toString(); }