diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3c04711f3ed..cc03df767d5 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -458,6 +458,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby) + MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect + (Jonathan Eagles via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlock.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlock.java index 7e8fd746d01..12d5554e9cd 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlock.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlock.java @@ -89,9 +89,11 @@ class AppsBlock extends HtmlBlock { td(appInfo.getName()). td(appInfo.getQueue()). td(). - br().$title(startTime)._()._(startTime)._(). + br().$title(String.valueOf(appInfo.getStartTime()))._(). + _(startTime)._(). td(). - br().$title(finishTime)._()._(finishTime)._(). + br().$title(String.valueOf(appInfo.getFinishTime()))._(). + _(finishTime)._(). td(appInfo.getState()). td(appInfo.getFinalStatus()). td(). diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java index 5d0060fe438..415f915cd5f 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java @@ -77,8 +77,10 @@ class AppsList implements ToJSON { append(escapeHtml(appInfo.getUser())).append(_SEP). append(escapeJavaScript(escapeHtml(appInfo.getName()))).append(_SEP). append(escapeHtml(appInfo.getQueue())).append(_SEP); - appendSortable(out, startTime).append(startTime).append(_SEP); - appendSortable(out, finishTime).append(finishTime).append(_SEP). + appendSortable(out, appInfo.getStartTime()). + append(startTime).append(_SEP); + appendSortable(out, appInfo.getFinishTime()). + append(finishTime).append(_SEP). append(appInfo.getState()).append(_SEP). append(appInfo.getFinalStatus()).append(_SEP); appendProgressBar(out, appInfo.getProgress()).append(_SEP); diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java index cdb36f839a7..cd26955c277 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java @@ -62,10 +62,10 @@ public class RmView extends TwoColumnLayout { private String appsTableInit() { AppsList list = getInstance(AppsList.class); - // id, user, name, queue, starttime, finishtime, state, progress, ui + // id, user, name, queue, starttime, finishtime, state, status, progress, ui StringBuilder init = tableInit(). append(", aoColumns:[{sType:'title-numeric'}, null, null, null, "). - append("null, null , null, "). + append("{sType:'title-numeric'}, {sType:'title-numeric'} , null, "). append("null,{sType:'title-numeric', bSearchable:false}, null]"); // Sort by id upon page load