MAPREDUCE-6408. Queue name and user name should be printed on the job page. (Siqi Li via gera)

(cherry picked from commit 11ac84820746e43f1e7072e08f62ddf81713aeb2)

hadoop-mapreduce-project/CHANGES.txt

@@ -94,6 +94,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6305. AM/Task log page should be able to link back to the job.
     (Siqi Li via gera)
 
+    MAPREDUCE-6408. Queue name and user name should be printed on the job page.
+    (Siqi Li via gera)
+
   OPTIMIZATIONS
 
   BUG FIXES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java

@@ -78,6 +78,8 @@ public class JobBlock extends HtmlBlock {
     JobInfo jinfo = new JobInfo(job, true);
     info("Job Overview").
         _("Job Name:", jinfo.getName()).
+        _("User Name:", jinfo.getUserName()).
+        _("Queue Name:", jinfo.getQueueName()).
         _("State:", jinfo.getState()).
         _("Uberized:", jinfo.isUberized()).
         _("Started:", new Date(jinfo.getStartTime())).

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java

@@ -51,6 +51,7 @@ public class JobInfo {
   protected String id;
   protected String name;
   protected String user;
+  protected String queue;
   protected JobState state;
   protected int mapsTotal;
   protected int mapsCompleted;
@@ -97,6 +98,7 @@ public class JobInfo {
     }
     this.name = job.getName().toString();
     this.user = job.getUserName();
+    this.queue = job.getQueueName();
     this.state = job.getState();
     this.mapsTotal = job.getTotalMaps();
     this.mapsCompleted = job.getCompletedMaps();
@@ -223,6 +225,10 @@ public class JobInfo {
     return this.name;
   }
 
+  public String getQueueName() {
+    return this.queue;
+  }
+
   public String getId() {
     return this.id;
   }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java

@@ -413,7 +413,7 @@ public class TestAMWebServicesJobs extends JerseyTest {
 
   public void verifyAMJob(JSONObject info, Job job) throws JSONException {
 
-    assertEquals("incorrect number of elements", 30, info.length());
+    assertEquals("incorrect number of elements", 31, info.length());
 
     // everyone access fields
     verifyAMJobGeneric(job, info.getString("id"), info.getString("user"),