svn commit: r808525 - in /hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred: JobTracker.java TaskTracker.java

[st...@apache.org]

Author: stevel
Date: Thu Aug 27 17:03:48 2009
New Revision: 808525

URL: http://svn.apache.org/viewvc?rev=808525&view=rev
Log:
MAPREDUCE-233 innerStart can throw InterruptedException()

Modified:
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=808525&r1=808524&r2=808525&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java Thu Aug 27 17:03:48 2009
@@ -1871,8 +1871,10 @@
    * JobTracker does not go live until {@link #offerService()} is called.
    * accordingly, JobTracker does not enter the Live state here.
    * @throws IOException for any startup problems
+   * @throws InterruptedException if the thread was interrupted on startup
    */
-  protected void innerStart() throws IOException {
+  @Override
+  protected void innerStart() throws IOException, InterruptedException {
     // This is a directory of temporary submission files.  We delete it
     // on startup, and can delete any files that we're done with
     JobConf jobConf = new JobConf(conf);

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=808525&r1=808524&r2=808525&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java Thu Aug 27 17:03:48 2009
@@ -571,7 +571,7 @@
     int connectTimeout = fConf
             .getInt("mapred.task.tracker.connect.timeout", 60000);
     this.jobClient = (InterTrackerProtocol) 
-      RPC.waitForProxy(InterTrackerProtocol.class,
+    RPC.waitForProxy(InterTrackerProtocol.class,
                        InterTrackerProtocol.versionID, 
                        jobTrackAddr, this.fConf, connectTimeout);
     if (LOG.isDebugEnabled()) {
@@ -1187,7 +1187,7 @@
    * clean.
    * @throws IOException when errors happen during shutdown
    */
-  public synchronized void closeTaskTracker() throws IOException {
+  protected synchronized void closeTaskTracker() throws IOException {
     if (!running) {
       //this operation is a no-op when not already running
       return;
@@ -1301,9 +1301,11 @@
    * {@inheritDoc}
    *
    * @throws IOException for any problem.
+   * @throws InterruptedException if the thread was interrupted on startup
    */
   @Override
-  protected synchronized void innerStart() throws IOException {
+  protected synchronized void innerStart() 
+          throws IOException, InterruptedException {
     JobConf conf = fConf;
     fConf = conf;
     maxMapSlots = conf.getInt("mapred.tasktracker.map.tasks.maximum", 2);