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

svn merge -c 1335096 FIXES: MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect (Jonathan Eagles via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335098 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-05-07 16:19:34 +00:00
parent af074299c2
commit e54add89a8
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -349,6 +349,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4048. NullPointerException exception while accessing the MAPREDUCE-4048. NullPointerException exception while accessing the
Application Master UI (Devaraj K via bobby) 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 Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlock.java
View File

@ -89,9 +89,11 @@ class AppsBlock extends HtmlBlock {
td(appInfo.getName()). td(appInfo.getName()).
td(appInfo.getQueue()). td(appInfo.getQueue()).
td(). td().
br().$title(startTime)._()._(startTime)._(). br().$title(String.valueOf(appInfo.getStartTime()))._().
_(startTime)._().
td(). td().
br().$title(finishTime)._()._(finishTime)._(). br().$title(String.valueOf(appInfo.getFinishTime()))._().
_(finishTime)._().
td(appInfo.getState()). td(appInfo.getState()).
td(appInfo.getFinalStatus()). td(appInfo.getFinalStatus()).
td(). td().

6
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java
View File

@ -77,8 +77,10 @@ class AppsList implements ToJSON {
append(escapeHtml(appInfo.getUser())).append(_SEP). append(escapeHtml(appInfo.getUser())).append(_SEP).
append(escapeJavaScript(escapeHtml(appInfo.getName()))).append(_SEP). append(escapeJavaScript(escapeHtml(appInfo.getName()))).append(_SEP).
append(escapeHtml(appInfo.getQueue())).append(_SEP); append(escapeHtml(appInfo.getQueue())).append(_SEP);
appendSortable(out, startTime).append(startTime).append(_SEP); appendSortable(out, appInfo.getStartTime()).
appendSortable(out, finishTime).append(finishTime).append(_SEP). append(startTime).append(_SEP);
appendSortable(out, appInfo.getFinishTime()).
append(finishTime).append(_SEP).
append(appInfo.getState()).append(_SEP). append(appInfo.getState()).append(_SEP).
append(appInfo.getFinalStatus()).append(_SEP); append(appInfo.getFinalStatus()).append(_SEP);
appendProgressBar(out, appInfo.getProgress()).append(_SEP); appendProgressBar(out, appInfo.getProgress()).append(_SEP);

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
View File

@ -62,10 +62,10 @@ public class RmView extends TwoColumnLayout {
private String appsTableInit() { private String appsTableInit() {
AppsList list = getInstance(AppsList.class); 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(). StringBuilder init = tableInit().
append(", aoColumns:[{sType:'title-numeric'}, null, null, null, "). 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]"); append("null,{sType:'title-numeric', bSearchable:false}, null]");
// Sort by id upon page load // Sort by id upon page load