svn commit: r581319 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/JobClient.java src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java src/java/org/apache/hadoop/mapred/LocalJobRunner.java

[omalley]

Author: omalley
Date: Tue Oct  2 10:50:55 2007
New Revision: 581319

URL: http://svn.apache.org/viewvc?rev=581319&view=rev
Log:
HADOOP-1977.  Fixed handling of ToolBase cli options in JobClient. (enis via 
omalley)

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java
    
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=581319&r1=581318&r2=581319&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Oct  2 10:50:55 2007
@@ -214,9 +214,6 @@
     HADOOP-1930.  Fix the blame for failed fetchs on the right host. (Arun C.
     Murthy via omalley)
 
-    HADOOP-1862.  reduces are getting stuck trying to find map outputs. 
-    (Arun C. Murthy via ddas)
-
   IMPROVEMENTS
 
     HADOOP-1908. Restructure data node code so that block sending and 
@@ -326,11 +323,16 @@
 
 Release 0.14.2 - unreleased
 
+  BUG FIXES
+
     HADOOP-1948. Removed spurious error message during block crc upgrade.
     (Raghu Angadi via dhruba)
 
     HADOOP-1862.  reduces are getting stuck trying to find map outputs. 
     (Arun C. Murthy via ddas)
+
+    HADOOP-1977. Fixed handling of ToolBase cli options in JobClient.
+    (enis via omalley)
 
 Release 0.14.1 - 2007-09-04
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java?rev=581319&r1=581318&r2=581319&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java Tue 
Oct  2 10:50:55 2007
@@ -862,7 +862,7 @@
     if (submitJobFile != null) {
       conf = new JobConf(submitJobFile);
     } else {
-      conf = new JobConf();
+      conf = new JobConf(getConf());
     }
     init(conf);
         

Modified: 
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java?rev=581319&r1=581318&r2=581319&view=diff
==============================================================================
--- 
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
 (original)
+++ 
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
 Tue Oct  2 10:50:55 2007
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.mapred;
 
-import java.io.*;
+import java.io.IOException;
 
 import org.apache.hadoop.ipc.VersionedProtocol;
 
@@ -70,12 +70,14 @@
   public boolean killTask(String taskId, boolean shouldFail) throws 
IOException;
   
   /**
-   * Grab a handle to a job that is already known to the JobTracker
+   * Grab a handle to a job that is already known to the JobTracker.
+   * @return Profile of the job, or null if not found. 
    */
   public JobProfile getJobProfile(String jobid) throws IOException;
 
   /**
-   * Grab a handle to a job that is already known to the JobTracker
+   * Grab a handle to a job that is already known to the JobTracker.
+   * @return Status of the job, or null if not found.
    */
   public JobStatus getJobStatus(String jobid) throws IOException;
 

Modified: 
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=581319&r1=581318&r2=581319&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java 
Tue Oct  2 10:50:55 2007
@@ -28,7 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.*;
+import org.apache.hadoop.io.BytesWritable;
+import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.mapred.JobTracker.JobTrackerMetrics;
 
 /** Implements MapReduce locally, in-process, for debugging. */ 
@@ -97,6 +98,7 @@
       return profile;
     }
     
+    @Override
     public void run() {
       try {
         // split input into minimum number of splits
@@ -291,7 +293,10 @@
 
   public JobProfile getJobProfile(String id) {
     Job job = jobs.get(id);
-    return job.getProfile();
+    if(job != null)
+      return job.getProfile();
+    else 
+      return null;
   }
 
   public TaskReport[] getMapTaskReports(String id) {
@@ -303,7 +308,10 @@
 
   public JobStatus getJobStatus(String id) {
     Job job = jobs.get(id);
-    return job.status;
+    if(job != null)
+      return job.status;
+    else 
+      return null;
   }
   
   public Counters getJobCounters(String id) {