hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r397310 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
Date Wed, 26 Apr 2006 21:43:06 GMT
Author: cutting
Date: Wed Apr 26 14:43:05 2006
New Revision: 397310

URL: http://svn.apache.org/viewcvs?rev=397310&view=rev
Log:
Fix HADOOP-168.  Add IOException to throws of all MapReduce RPC protocol methods.  Contributed
by Owen.

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

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/CHANGES.txt?rev=397310&r1=397309&r2=397310&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Apr 26 14:43:05 2006
@@ -101,6 +101,11 @@
     Nutch only uses ObjectWritable in intermediate files, so this
     should not be a problem for Nutch.  (Stefan & cutting)
 
+27. Fix HADOOP-168.  MapReduce RPC protocol methods should all declare
+    IOException, so that timeouts are handled appropriately.
+    (omalley via cutting)
+
+
 Release 0.1.1 - 2006-04-08
 
  1. Added CHANGES.txt, logging all significant changes to Hadoop.  (cutting)

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java?rev=397310&r1=397309&r2=397310&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java Wed Apr
26 14:43:05 2006
@@ -34,16 +34,17 @@
    * TaskTracker must also indicate whether this is the first interaction
    * (since state refresh)
    */
-  int emitHeartbeat(TaskTrackerStatus status, boolean initialContact);
+  int emitHeartbeat(TaskTrackerStatus status, 
+                    boolean initialContact) throws IOException;
 
   /** Called to get new tasks from from the job tracker for this tracker.*/
-  Task pollForNewTask(String trackerName);
+  Task pollForNewTask(String trackerName) throws IOException;
 
   /** Called to find which tasks that have been run by this tracker should now
    * be closed because their job is complete.  This is used to, e.g., 
    * notify a map task that its output is no longer needed and may 
    * be removed. */
-  String[] pollForTaskWithClosedJob(String trackerName);
+  String[] pollForTaskWithClosedJob(String trackerName) throws IOException;
 
   /** Called by a reduce task to find which map tasks are completed.
    *
@@ -51,7 +52,9 @@
    * @param mapTasksNeeded an array of UTF8 naming map task ids whose output is needed.
    * @return an array of MapOutputLocation
    */
-  MapOutputLocation[] locateMapOutputs(String taskId, String[][] mapTasksNeeded);
+  MapOutputLocation[] locateMapOutputs(String taskId, 
+                                       String[][] mapTasksNeeded
+                                       ) throws IOException;
 
   /**
    * The task tracker calls this once, to discern where it can find

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java?rev=397310&r1=397309&r2=397310&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 Wed Apr
26 14:43:05 2006
@@ -34,28 +34,28 @@
      * Get the current status of the cluster
      * @return summary of the state of the cluster
      */
-    public ClusterStatus getClusterStatus();
+    public ClusterStatus getClusterStatus() throws IOException;
     
     /**
      * Kill the indicated job
      */
-    public void killJob(String jobid);
+    public void killJob(String jobid) throws IOException;
 
     /**
      * Grab a handle to a job that is already known to the JobTracker
      */
-    public JobProfile getJobProfile(String jobid);
+    public JobProfile getJobProfile(String jobid) throws IOException;
 
     /**
      * Grab a handle to a job that is already known to the JobTracker
      */
-    public JobStatus getJobStatus(String jobid);
+    public JobStatus getJobStatus(String jobid) throws IOException;
 
     /**
      * Grab a bunch of info on the tasks that make up the job
      */
-    public TaskReport[] getMapTaskReports(String jobid);
-    public TaskReport[] getReduceTaskReports(String jobid);
+    public TaskReport[] getMapTaskReports(String jobid) throws IOException;
+    public TaskReport[] getReduceTaskReports(String jobid) throws IOException;
 
     /**
      * A MapReduce system always operates on a single filesystem.  This 



Mime
View raw message