hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r930423 - in /hadoop/mapreduce/trunk: ./ src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/ src/contrib/mumak/src/java/org/apache/hadoop/mapred/ src/contrib/mumak/sr...
Date Fri, 02 Apr 2010 23:01:23 GMT
Author: mahadev
Date: Fri Apr  2 23:01:23 2010
New Revision: 930423

URL: http://svn.apache.org/viewvc?rev=930423&view=rev
Log:
MAPREDUCE-1656. JobStory should provide queue info. (hong via mahadev)

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
    hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
    hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
    hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
    hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
    hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/JobStory.java
    hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Apr  2 23:01:23 2010
@@ -241,6 +241,8 @@ Trunk (unreleased changes)
     MAPREDUCE-1428.  Make block size and the size of archive created files
     configurable.  (mahadev via szetszwo)
 
+    MAPREDUCE-1656. JobStory should provide queue info. (hong via mahadev)
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band

Modified: hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
Fri Apr  2 23:01:23 2010
@@ -152,6 +152,9 @@ abstract class JobFactory<T> implements 
     public Values getOutcome() {
       return job.getOutcome();
     }
+    public String getQueueName() {
+      return job.getQueueName();
+    }
   }
 
   protected abstract Thread createReaderThread() ; 

Modified: hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
Fri Apr  2 23:01:23 2010
@@ -23,6 +23,7 @@ import org.apache.hadoop.tools.rumen.Tas
 import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
 import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.mapreduce.InputSplit;
@@ -267,6 +268,11 @@ public class DebugJobProducer implements
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String getQueueName() {
+      return JobConf.DEFAULT_QUEUE_NAME;
+    }
+    
     public static void reset() {
       seq.set(0);
       timestamp.set(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
Fri Apr  2 23:01:23 2010
@@ -102,4 +102,9 @@ public class SimulatorJobStory implement
   public Pre21JobHistoryConstants.Values getOutcome() {
     return job.getOutcome();
   }
+  
+  @Override
+  public String getQueueName() {
+    return job.getQueueName();
+  }
 }

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
Fri Apr  2 23:01:23 2010
@@ -167,4 +167,9 @@ public class FakeJobs implements JobStor
   public Pre21JobHistoryConstants.Values getOutcome() {
     return Pre21JobHistoryConstants.Values.SUCCESS;
   }
+  
+  @Override
+  public String getQueueName() {
+    return JobConf.DEFAULT_QUEUE_NAME;
+  }
 }

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
(original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
Fri Apr  2 23:01:23 2010
@@ -220,5 +220,10 @@ public class TestSimulatorJobClient {
     public Pre21JobHistoryConstants.Values getOutcome() {
       return Pre21JobHistoryConstants.Values.SUCCESS;
     }
+    
+    @Override
+    public String getQueueName() {
+      return JobConf.DEFAULT_QUEUE_NAME;
+    }
   }
 }

Modified: hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/JobStory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/JobStory.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/JobStory.java (original)
+++ hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/JobStory.java Fri Apr 
2 23:01:23 2010
@@ -115,4 +115,10 @@ public interface JobStory {
    * @return The outcome of the job execution.
    */
   public Values getOutcome();
+  
+  /**
+   * Get the queue where the job is submitted.
+   * @return the queue where the job is submitted.
+   */
+  public String getQueueName();
 }

Modified: hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java?rev=930423&r1=930422&r2=930423&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java (original)
+++ hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java Fri Apr
 2 23:01:23 2010
@@ -126,6 +126,7 @@ public class ZombieJob implements JobSto
       jobConf.setUser(getUser());
       jobConf.setNumMapTasks(getNumberMaps());
       jobConf.setNumReduceTasks(getNumberReduces());
+      jobConf.setQueueName(getQueueName());
     }
     return jobConf;
   }
@@ -254,6 +255,12 @@ public class ZombieJob implements JobSto
     return job.getSubmitTime() - job.getRelativeTime();
   }
 
+  @Override
+  public String getQueueName() {
+    String queue = job.getQueue();
+    return (queue == null)? JobConf.DEFAULT_QUEUE_NAME : queue;
+  }
+  
   /**
    * Getting the number of map tasks that are actually logged in the trace.
    * @return The number of map tasks that are actually logged in the trace.



Mime
View raw message