svn commit: r289281 - in /lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred: LocalJobRunner.java MapTask.java ReduceTask.java Task.java

[cutting]

Author: cutting
Date: Thu Sep 15 10:12:36 2005
New Revision: 289281

URL: http://svn.apache.org/viewcvs?rev=289281&view=rev
Log:
Improve status reports: Always send final status when done; Have LocalJobRunner 
log status.

Modified:
    
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/LocalJobRunner.java
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java
    
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/LocalJobRunner.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/LocalJobRunner.java?rev=289281&r1=289280&r2=289281&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/LocalJobRunner.java
 (original)
+++ 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/LocalJobRunner.java
 Thu Sep 15 10:12:36 2005
@@ -18,12 +18,16 @@
 
 import java.io.*;
 import java.util.*;
+import java.util.logging.*;
 
 import org.apache.nutch.io.*;
 import org.apache.nutch.fs.*;
+import org.apache.nutch.util.*;
 
 /** Implements MapReduce locally, in-process, for debugging. */ 
 public class LocalJobRunner implements JobSubmissionProtocol {
+  public static final Logger LOG =
+    LogFormatter.getLogger("org.apache.nutch.mapred.LocalJobRunner");
 
   private NutchFileSystem fs;
   private HashMap jobs = new HashMap();
@@ -102,6 +106,7 @@
     public Task getTask(String taskid) { return null; }
 
     public void progress(String taskId, float progress, String state) {
+      LOG.info(state);
       float taskIndex = mapIds.indexOf(taskId);
       if (taskIndex >= 0) {                       // mapping
         float numTasks = mapIds.size();

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java?rev=289281&r1=289280&r2=289281&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java 
Thu Sep 15 10:12:36 2005
@@ -129,7 +129,7 @@
         }
       }
     }
-    umbilical.done(getTaskId());
+    done(umbilical);
   }
   
 }

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java?rev=289281&r1=289280&r2=289281&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java 
(original)
+++ 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java 
Thu Sep 15 10:12:36 2005
@@ -270,7 +270,7 @@
       out.close(reporter);
     }
 
-    umbilical.done(getTaskId());
+    done(umbilical);
   }
 
   /** Construct output file names so that, when an output directory listing is

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java?rev=289281&r1=289280&r2=289281&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java Thu 
Sep 15 10:12:36 2005
@@ -114,4 +114,10 @@
     }
   }
 
+  public void done(TaskUmbilicalProtocol umbilical)
+    throws IOException {
+    umbilical.progress(getTaskId(),               // send a final status report
+                       taskProgress.get(), taskProgress.toString());
+    umbilical.done(getTaskId());
+  }
 }