Repository: hadoop Updated Branches: refs/heads/trunk 7b424f938 -> 11ac84820
MAPREDUCE-6408. Queue name and user name should be printed on the job page. (Siqi Li via gera) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/11ac8482 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/11ac8482 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/11ac8482 Branch: refs/heads/trunk Commit: 11ac84820746e43f1e7072e08f62ddf81713aeb2 Parents: 7b424f9 Author: Gera Shegalov <g...@apache.org> Authored: Mon Jun 22 14:23:22 2015 -0700 Committer: Gera Shegalov <g...@apache.org> Committed: Mon Jun 22 14:40:32 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java | 2 ++ .../org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java | 6 ++++++ .../hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/11ac8482/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c42e410..bae2674 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -358,6 +358,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/11ac8482/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java index 0c6d773..a599870 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/JobBlock.java +++ b/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())). http://git-wip-us.apache.org/repos/asf/hadoop/blob/11ac8482/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java index d823cad..ffb243b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobInfo.java +++ b/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; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/11ac8482/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index 2783379..a61e407 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/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"),