hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1131295 - in /hadoop/mapreduce/branches/MR-279: ./ mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/ mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/ mr-...
Date Fri, 03 Jun 2011 23:50:25 GMT
Author: mahadev
Date: Fri Jun  3 23:50:24 2011
New Revision: 1131295

URL: http://svn.apache.org/viewvc?rev=1131295&view=rev
Log:
Fix various issues with Web UI's. (Luke Lu)

Added:
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
Removed:
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/Times.java
Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryContext.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/FilterService.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/Service.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Params.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/resources/webapps/static/dt-1.7.5/css/jui-dt.css
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Fri Jun  3 23:50:24 2011
@@ -5,6 +5,8 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
+    Fix various issues with Web UI's. (Luke Lu)
+
     Fixed inconsistency in QueueACL enums. (acmurthy)
 
     Fixing the wrong config key used in JobHistory that prevented configuring

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java
Fri Jun  3 23:50:24 2011
@@ -20,6 +20,7 @@ package org.apache.hadoop.mapreduce.v2.a
 
 import java.util.Map;
 
+import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.mapreduce.v2.api.records.JobId;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.yarn.Clock;
@@ -30,10 +31,15 @@ import org.apache.hadoop.yarn.event.Even
 /**
  * Context interface for sharing information across components in YARN App.
  */
+@InterfaceAudience.Private
 public interface AppContext {
 
   ApplicationId getApplicationID();
 
+  String getApplicationName();
+
+  long getStartTime();
+
   CharSequence getUser();
 
   Job getJob(JobId jobID);

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
Fri Jun  3 23:50:24 2011
@@ -108,6 +108,8 @@ public class MRAppMaster extends Composi
   private static final Log LOG = LogFactory.getLog(MRAppMaster.class);
 
   private Clock clock;
+  private final long startTime = System.currentTimeMillis();
+  private String appName;
   private final int startCount;
   private final ApplicationId appID;
   protected final MRAppMetrics metrics;
@@ -140,9 +142,13 @@ public class MRAppMaster extends Composi
 
   @Override
   public void init(final Configuration conf) {
-    context = new RunningAppContext(); 
+    context = new RunningAppContext();
 
-     if (conf.getBoolean(AMConstants.RECOVERY_ENABLE, false) 
+    // Job name is the same as the app name util we support DAG of jobs
+    // for an app later
+    appName = conf.get(MRJobConfig.JOB_NAME, "<missing app name>");
+
+    if (conf.getBoolean(AMConstants.RECOVERY_ENABLE, false)
          && startCount > 1) {
       LOG.info("Recovery is enabled. Will try to recover from previous life.");
       Recovery recoveryServ = new RecoveryService(appID, clock, startCount);
@@ -434,6 +440,16 @@ public class MRAppMaster extends Composi
     }
 
     @Override
+    public String getApplicationName() {
+      return appName;
+    }
+
+    @Override
+    public long getStartTime() {
+      return startTime;
+    }
+
+    @Override
     public Job getJob(JobId jobID) {
       return jobs.get(jobID);
     }

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
Fri Jun  3 23:50:24 2011
@@ -135,6 +135,7 @@ public class JobImpl implements org.apac
   private final Lock readLock;
   private final Lock writeLock;
   private final JobId jobId;
+  private final String jobName;
   private final org.apache.hadoop.mapreduce.JobID oldJobId;
   private final TaskAttemptListener taskAttemptListener;
   private final Object tasksSyncHandle = new Object();
@@ -349,6 +350,7 @@ public class JobImpl implements org.apac
       Set<TaskId> completedTasksFromPreviousRun, MRAppMetrics metrics) {
 
     this.jobId = recordFactory.newRecordInstance(JobId.class);
+    this.jobName = conf.get(JobContext.JOB_NAME, "<missing job name>");
     this.conf = conf;
     this.metrics = metrics;
     this.clock = clock;
@@ -681,7 +683,7 @@ public class JobImpl implements org.apac
 
   @Override
   public String getName() {
-    return "FIXME! job name";
+    return jobName;
   }
 
   @Override

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
Fri Jun  3 23:50:24 2011
@@ -29,6 +29,7 @@ import org.apache.hadoop.mapreduce.v2.ap
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.util.Apps;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.Controller;
 
 import com.google.inject.Inject;
@@ -41,8 +42,7 @@ public class AppController extends Contr
     super(ctx);
     this.app = app;
     set(APP_ID, Apps.toString(app.context.getApplicationID()));
-    set(RM_WEB, join("http://", conf.get(
-        YarnConfiguration.RM_WEBAPP_BIND_ADDRESS, "localhost:8888")));
+    set(RM_WEB, YarnConfiguration.getRMWebAppURL(conf));
   }
 
   @Inject
@@ -57,10 +57,10 @@ public class AppController extends Contr
   public void info() {
     info("Application Master Overview").
       _("Application ID:", $(APP_ID)).
-      _("Application Name:", "FIXAPI: app name").
+      _("Application Name:", app.context.getApplicationName()).
       _("User:", app.context.getUser()).
-      _("Started on:", "FIXAPI: started on").
-      _("Elasped: ", "FIXAPI: elapsed time");
+      _("Started on:", Times.format(app.context.getStartTime())).
+      _("Elasped: ", Times.elapsed(app.context.getStartTime(), 0));
     render(InfoPage.class);
   }
 

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java
Fri Jun  3 23:50:24 2011
@@ -30,6 +30,7 @@ import org.apache.hadoop.mapreduce.v2.ap
 import org.apache.hadoop.mapreduce.v2.app.job.Task;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 import org.apache.hadoop.yarn.webapp.view.InfoBlock;
 import static org.apache.hadoop.mapreduce.v2.app.webapp.AMWebApp.*;

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
Fri Jun  3 23:50:24 2011
@@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.v2.ut
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.util.ConverterUtils;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.SubView;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.*;
@@ -57,7 +58,7 @@ public class TaskPage extends AppView {
             th(".id", "Attempt").
             th(".progress", "Progress").
             th(".state", "State").
-            th(".logs", "Logs").
+            th(".node", "node").
             th(".tsh", "Started").
             th(".tsh", "Finished").
             th(".tsh", "Elapsed").
@@ -67,25 +68,25 @@ public class TaskPage extends AppView {
         String taid = MRApps.toString(ta.getID());
         String progress = percent(ta.getProgress());
         ContainerId containerId = ta.getAssignedContainerID();
+
         String nodeHttpAddr = ta.getNodeHttpAddress();
         long startTime = ta.getLaunchTime();
         long finishTime = ta.getFinishTime();
         long elapsed = Times.elapsed(startTime, finishTime);
-        TR<TBODY<TABLE<Hamlet>>> tr = tbody.
+        TD<TR<TBODY<TABLE<Hamlet>>>> nodeTd = tbody.
           tr().
             td(".id", taid).
             td(".progress", progress).
-            td(".state", ta.getState().toString());
+            td(".state", ta.getState().toString()).
+            td().
+              a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr);
         if (containerId != null) {
           String containerIdStr = ConverterUtils.toString(containerId);
-          tr.
-            td().
-              a(".logs", url("http://", nodeHttpAddr, "yarn", "containerlogs",
-                containerIdStr), "Logs for " + containerIdStr)._();
-        } else {
-          tr.td("N/A");
+          nodeTd._(" ").
+            a(".logslink", url("http://", nodeHttpAddr, "yarn", "containerlogs",
+              containerIdStr), "logs");
         }
-        tr.
+        nodeTd._().
           td(".ts", Times.format(startTime)).
           td(".ts", Times.format(finishTime)).
           td(".dt", StringUtils.formatTime(elapsed)).

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java
Fri Jun  3 23:50:24 2011
@@ -25,6 +25,7 @@ import org.apache.hadoop.mapreduce.v2.ap
 import org.apache.hadoop.mapreduce.v2.app.job.Task;
 import org.apache.hadoop.mapreduce.v2.util.MRApps;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.*;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java
Fri Jun  3 23:50:24 2011
@@ -487,6 +487,16 @@ public class TestRMContainerAllocator {
       public Clock getClock() {
         return null;
       }
+
+      @Override
+      public String getApplicationName() {
+        return null;
+      }
+
+      @Override
+      public long getStartTime() {
+        return 0;
+      }
     }
   }
 

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java
Fri Jun  3 23:50:24 2011
@@ -777,5 +777,15 @@ public class TestRuntimeEstimators {
     public Clock getClock() {
       return clock;
     }
+
+    @Override
+    public String getApplicationName() {
+      return null;
+    }
+
+    @Override
+    public long getStartTime() {
+      return 0;
+    }
   }
 }

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java
Fri Jun  3 23:50:24 2011
@@ -43,6 +43,7 @@ public class TestAMWebApp {
     final ApplicationId appID;
     final String user = MockJobs.newUserName();
     final Map<JobId, Job> jobs;
+    final long startTime = System.currentTimeMillis();
 
     TestAppContext(int appid, int numJobs, int numTasks, int numAttempts) {
       appID = MockJobs.newAppID(appid);
@@ -82,6 +83,16 @@ public class TestAMWebApp {
     public Clock getClock() {
       return null;
     }
+
+    @Override
+    public String getApplicationName() {
+      return "TestApp";
+    }
+
+    @Override
+    public long getStartTime() {
+      return startTime;
+    }
   }
 
   @Test public void testAppControllerIndex() {

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryContext.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryContext.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryContext.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryContext.java
Fri Jun  3 23:50:24 2011
@@ -27,10 +27,5 @@ import org.apache.hadoop.mapreduce.v2.ap
 
 public interface HistoryContext extends AppContext {
 
-  Job getJob(JobId id);
-
   Map<JobId, Job> getAllJobs(ApplicationId appID);
-
-  Map<JobId, Job> getAllJobs();
-
 }

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java
Fri Jun  3 23:50:24 2011
@@ -561,9 +561,12 @@ public class JobHistory extends Abstract
     scanIntermediateDirectory();
     return intermediateListCache.get(jobId);
   }
-  
-  
-  
+
+  @Override
+  public String getApplicationName() {
+    return "Job History Server";
+  }
+
   private class MoveIntermediateToDoneRunnable implements Runnable {
 
     private long sleepTime;

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Fri Jun  3 23:50:24 2011
@@ -18,9 +18,14 @@
 
 package org.apache.hadoop.yarn.conf;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import java.util.Iterator;
 import org.apache.hadoop.conf.Configuration;
 
 public class YarnConfiguration extends Configuration {
+  private static final Splitter ADDR_SPLITTER = Splitter.on(':').trimResults();
+  private static final Joiner JOINER = Joiner.on("");
 
   public static final String RM_PREFIX = "yarn.server.resourcemanager.";
 
@@ -70,4 +75,16 @@ public class YarnConfiguration extends C
   public YarnConfiguration(Configuration conf) {
     super(conf);
   }
+
+  public static String getRMWebAppURL(Configuration conf) {
+    String addr = conf.get(RM_WEBAPP_BIND_ADDRESS,
+                           DEFAULT_RM_WEBAPP_BIND_ADDRESS);
+    Iterator<String> it = ADDR_SPLITTER.split(addr).iterator();
+    it.next(); // ignore the bind host
+    String port = it.next();
+    // Use apps manager address to figure out the host for webapp
+    addr = conf.get(APPSMANAGER_ADDRESS, DEFAULT_APPSMANAGER_BIND_ADDRESS);
+    String host = ADDR_SPLITTER.split(addr).iterator().next();
+    return JOINER.join("http://", host, ":", port, "/");
+  }
 }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java
Fri Jun  3 23:50:24 2011
@@ -31,6 +31,7 @@ public abstract class AbstractService im
   
   private STATE state = STATE.NOTINITED;
   private final String name;
+  private long startTime;
   private Configuration config;
   private List<ServiceStateChangeListener> listeners =
     new ArrayList<ServiceStateChangeListener>();
@@ -54,6 +55,7 @@ public abstract class AbstractService im
 
   @Override
   public synchronized void start() {
+    startTime = System.currentTimeMillis();
     ensureCurrentState(STATE.INITED);
     changeState(STATE.STARTED);
     LOG.info("Service:" + getName() + " is started.");
@@ -89,6 +91,11 @@ public abstract class AbstractService im
     return config;
   }
 
+  @Override
+  public long getStartTime() {
+    return startTime;
+  }
+
   private void ensureCurrentState(STATE currentState) {
     if (state != currentState) {
       throw new IllegalStateException("For this operation, current State must " +

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/FilterService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/FilterService.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/FilterService.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/FilterService.java
Fri Jun  3 23:50:24 2011
@@ -23,6 +23,7 @@ import org.apache.hadoop.conf.Configurat
 public class FilterService implements Service {
 
   private final Service service;
+  private final long startTime = System.currentTimeMillis();
 
   public FilterService(Service service) {
     this.service = service;
@@ -68,4 +69,8 @@ public class FilterService implements Se
     return service.getServiceState();
   }
 
+  @Override
+  public long getStartTime() {
+    return startTime;
+  }
 }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/Service.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/Service.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/Service.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/service/Service.java
Fri Jun  3 23:50:24 2011
@@ -41,5 +41,5 @@ public interface Service {
   String getName();
   Configuration getConfig();
   STATE getServiceState();
-
+  long getStartTime();
 }

Added: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java?rev=1131295&view=auto
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
(added)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
Fri Jun  3 23:50:24 2011
@@ -0,0 +1,43 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class Times {
+  static final ThreadLocal<SimpleDateFormat> dateFormat =
+      new ThreadLocal<SimpleDateFormat>() {
+        @Override protected SimpleDateFormat initialValue() {
+          return new SimpleDateFormat("d-MMM-yyyy HH:mm:ss");
+        }
+      };
+
+  public static long elapsed(long started, long finished) {
+    if (finished > 0) {
+      return finished - started;
+    }
+    return started > 0 ? System.currentTimeMillis() - started : 0;
+  }
+
+  public static String format(long ts) {
+    return ts > 0 ? String.valueOf(dateFormat.get().format(new Date(ts)))
+                  : "N/A";
+  }
+}

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Params.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Params.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Params.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Params.java
Fri Jun  3 23:50:24 2011
@@ -26,5 +26,6 @@ package org.apache.hadoop.yarn.webapp;
 public interface Params {
   static final String TITLE = "title";
   static final String TITLE_LINK = "title.href";
+  static final String USER = "user";
   static final String ERROR_DETAILS = "error.details";
 }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java
Fri Jun  3 23:50:24 2011
@@ -26,7 +26,7 @@ public class HeaderBlock extends HtmlBlo
     html.
       div("#header.ui-widget").
         div("#user").
-          _("Logged in as: "+ $("user"))._().
+          _("Logged in as: "+ request().getRemoteUser())._().
         div("#logo").
           img("/static/hadoop-st.png")._().
         h1($(TITLE))._();

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/resources/webapps/static/dt-1.7.5/css/jui-dt.css
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/resources/webapps/static/dt-1.7.5/css/jui-dt.css?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/resources/webapps/static/dt-1.7.5/css/jui-dt.css
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/resources/webapps/static/dt-1.7.5/css/jui-dt.css
Fri Jun  3 23:50:24 2011
@@ -304,8 +304,8 @@ table.display tr.odd.row_selected td {
 }
 
 /* Striping */
-tr.odd { background: rgba(0, 0, 0, 0.01); }
-tr.even { background: rgba(0, 0, 0, 0.05); }
+tr.odd { background: rgba(255, 255, 255, 0.1); }
+tr.even { background: rgba(0, 0, 255, 0.05); }
 
 
 /*
@@ -318,5 +318,5 @@ tr.even td.sorting_1 { background: rgba(
 tr.even td.sorting_2 { background: rgba(0, 0, 0, 0.06); }
 tr.even td.sorting_3 { background: rgba(0, 0, 0, 0.06); }
 
-.css_left { float: left; }
-.css_right { float: right; }
+.css_left { position: relative; float: left; }
+.css_right { position: relative; float: right; }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Fri Jun  3 23:50:24 2011
@@ -168,7 +168,7 @@ public class ResourceManager extends Com
   }
   
   @Override
-  public void start() { 
+  public void start() {
     try {
       doSecureLogin();
     } catch(IOException ie) {

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueMetrics.java
Fri Jun  3 23:50:24 2011
@@ -42,7 +42,7 @@ public class QueueMetrics {
 
   static final Logger LOG = LoggerFactory.getLogger(QueueMetrics.class);
   static final int GB = 1024; // resource.memory is in MB
-  static final MetricsInfo RECORD_INFO = info("SchedulerMetrics",
+  static final MetricsInfo RECORD_INFO = info("QueueMetrics",
       "Metrics for the resource scheduler");
   static final MetricsInfo QUEUE_INFO = info("Queue", "Metrics by queue");
   static final MetricsInfo USER_INFO = info("User", "Metrics by user");

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java
Fri Jun  3 23:50:24 2011
@@ -65,6 +65,7 @@ class AppsList implements ToJSON {
       appendLink(out, appID, rc.prefix(), "app", appID).append(_SEP).
           append(escapeHtml(app.getUser().toString())).append(_SEP).
           append(escapeHtml(app.getName().toString())).append(_SEP).
+          append(escapeHtml(app.getQueue())).append(_SEP).
           append(app.getState().toString()).append(_SEP);
       appendProgressBar(out, app.getStatus().getProgress()).append(_SEP);
       appendLink(out, ui, rc.prefix(), master == null ? "#" : "http://", ui).

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
Fri Jun  3 23:50:24 2011
@@ -62,8 +62,8 @@ class CapacitySchedulerPage extends RmVi
         float set = queue.getCapacity();
         float delta = Math.abs(set - used) + 0.001f;
         float max = queue.getMaximumCapacity();
-        if (max < EPSILON) max = 1f;
-        String absMaxPct = percent(queue.getAbsoluteMaximumCapacity());
+        if (max < EPSILON || max > 1f) max = 1f;
+        //String absMaxPct = percent(queue.getAbsoluteMaximumCapacity());
         LI<UL<Hamlet>> li = ul.
           li().
             a(_Q).$style(width(max * WIDTH_F)).

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
Fri Jun  3 23:50:24 2011
@@ -18,12 +18,14 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 
+import org.apache.hadoop.yarn.server.api.records.NodeHealthStatus;
 import java.util.Date;
 
 import com.google.inject.Inject;
 
 import org.apache.hadoop.yarn.server.resourcemanager.resourcetracker.NodeInfo;
 import org.apache.hadoop.yarn.server.resourcemanager.resourcetracker.ClusterTracker;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.SubView;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.*;
@@ -58,15 +60,14 @@ class NodesPage extends RmView {
           th(".mem", "Mem Avail (MB)")._()._().
           tbody();
       for (NodeInfo ni : resource.getAllNodeInfo()) {
+        NodeHealthStatus health = ni.getNodeHealthStatus();
         tbody.tr().
             td(ni.getRackName()).
             td(String.valueOf(ni.getNodeID().getId())).
             td().a("http://" + ni.getHttpAddress(), ni.getHttpAddress())._().
-            td(ni.getNodeHealthStatus().getIsNodeHealthy() ? "Healthy"
-                : "Unhealthy").
-            td(new Date(ni.getNodeHealthStatus()
-                .getLastHealthReportTime()).toString()).
-            td(String.valueOf(ni.getNodeHealthStatus().getHealthReport())).
+            td(health.getIsNodeHealthy() ? "Healthy" : "Unhealthy").
+            td(Times.format(health.getLastHealthReportTime())).
+            td(String.valueOf(health.getHealthReport())).
             td(String.valueOf(ni.getNumContainers())).
             td(String.valueOf(ni.getUsedResource().getMemory())).
             td(String.valueOf(ni.getAvailableResource().getMemory()))._();
@@ -89,8 +90,10 @@ class NodesPage extends RmView {
 
   private String nodesTableInit() {
     return tableInit().
-        // rack, nodeid, host, healthStatus, containers, memused, memavail
-        append(", aoColumns:[null, null, null, null, {bSearchable:false}, ").
-        append("{bSearchable:false}, {bSearchable:false}]}").toString();
+        // rack, nodeid, host, healthStatus, health update ts, health report,
+        // containers, memused, memavail
+        append(", aoColumns:[null, null, null, null, null, null, ").
+        append("{bSearchable:false},{bSearchable:false},{bSearchable:false}]}").
+        toString();
   }
 }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
Fri Jun  3 23:50:24 2011
@@ -20,8 +20,6 @@ package org.apache.hadoop.yarn.server.re
 
 import com.google.inject.Inject;
 
-import java.util.Date;
-
 import org.apache.hadoop.util.VersionInfo;
 import org.apache.hadoop.yarn.api.records.Application;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -31,6 +29,7 @@ import org.apache.hadoop.yarn.server.res
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
 import org.apache.hadoop.yarn.util.Apps;
+import org.apache.hadoop.yarn.util.Times;
 import org.apache.hadoop.yarn.webapp.Controller;
 import org.apache.hadoop.yarn.webapp.ResponseInfo;
 
@@ -53,8 +52,8 @@ public class RmController extends Contro
     info("Cluster overview").
       _("Cluster ID:", ts).
       _("ResourceManager state:", rm.getServiceState()).
-      _("ResourceManager started on:", new Date(ts)).
-      _("ResourceManager version:", "FIXAPI: 1.0-SNAPSHOT").
+      _("ResourceManager started on:", Times.format(ts)).
+      _("ResourceManager version:", "1.0-SNAPSHOT").
       _("Hadoop version:", VersionInfo.getBuildVersion());
     render(InfoPage.class);
   }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmView.java
Fri Jun  3 23:50:24 2011
@@ -39,7 +39,7 @@ public class RmView extends TwoColumnLay
   }
 
   protected void commonPreHead(Page.HTML<_> html) {
-    html.meta_http("refresh", "20");
+    //html.meta_http("refresh", "20");
     set(ACCORDION_ID, "nav");
     set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
     set(THEMESWITCHER_ID, "themeswitcher");

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java?rev=1131295&r1=1131294&r2=1131295&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java
Fri Jun  3 23:50:24 2011
@@ -217,7 +217,7 @@ public class TestRMWebApp {
 
   public static void main(String[] args) throws Exception {
     // For manual testing
-    WebApps.$for("yarn", new TestRMWebApp()).at(8888).inDevMode().
-        start(new RMWebApp(mockRm(42, 8, 8, 8*GiB))).joinThread();
+    WebApps.$for("yarn", new TestRMWebApp()).at(8088).inDevMode().
+        start(new RMWebApp(mockRm(101, 8, 8, 8*GiB))).joinThread();
   }
 }



Mime
View raw message