svn commit: r521904 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/JobTracker.java

[cutting]

Author: cutting
Date: Fri Mar 23 14:06:13 2007
New Revision: 521904

URL: http://svn.apache.org/viewvc?view=rev&rev=521904
Log:
HADOOP-1071.  Improve handling of protocol version mismatch in JobTracker.  
Contributed by Tahir Hashmi.

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

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=521904&r1=521903&r2=521904
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Fri Mar 23 14:06:13 2007
@@ -12,6 +12,9 @@
  3. HADOOP-1101.  In web ui, split shuffle statistics from reduce
     statistics, and add some task averages.  (Devaraj Das via cutting)
 
+ 4. HADOOP-1071.  Improve handling of protocol version mismatch in
+    JobTracker.  (Tahir Hashmi via cutting)
+
 
 Release 0.12.2 - 2007-23-17
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java?view=diff&rev=521904&r1=521903&r2=521904
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java 
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java Fri 
Mar 23 14:06:13 2007
@@ -41,6 +41,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.ipc.RPC.VersionMismatch;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
@@ -91,6 +92,9 @@
         try {
           tracker = new JobTracker(conf);
           break;
+        } catch (VersionMismatch v) {
+          // Can't recover from a version mismatch. Avoid the retry loop and 
re-throw
+          throw v;
         } catch (IOException e) {
           LOG.warn("Error starting tracker: " + 
                    StringUtils.stringifyException(e));
@@ -1669,7 +1673,7 @@
         Configuration conf=new Configuration();
         startTracker(conf);
       } catch ( Throwable e ) {
-        LOG.error( StringUtils.stringifyException( e ) );
+        LOG.fatal( StringUtils.stringifyException( e ) );
         System.exit(-1);
       }
     }