Repository: hadoop Updated Branches: refs/heads/trunk b2540f486 -> 790a86176
MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/790a8617 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/790a8617 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/790a8617 Branch: refs/heads/trunk Commit: 790a861766dcd60212d83f444f2f96d3acf20a94 Parents: b2540f4 Author: Devaraj K <[email protected]> Authored: Fri Jun 5 15:50:16 2015 +0530 Committer: Devaraj K <[email protected]> Committed: Fri Jun 5 15:50:16 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/790a8617/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index fd40ad2..2ffa541 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -450,6 +450,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. (Siqi Li via gera) + MAPREDUCE-6377. JHS sorting on state column not working in webUi. + (zhihai xu via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/790a8617/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java ---------------------------------------------------------------------- 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 59b7aa6..229bbb0 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(); }
