Просмотр исходного кода

HADOOP-1071. Improve handling of protocol version mismatch in JobTracker. Contributed by Tahir Hashmi.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@521904 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 лет назад
Родитель
Сommit
2068e8da6a
2 измененных файлов с 8 добавлено и 1 удалено
  1. 3 0
      CHANGES.txt
  2. 5 1
      src/java/org/apache/hadoop/mapred/JobTracker.java

+ 3 - 0
CHANGES.txt

@@ -12,6 +12,9 @@ Trunk (unreleased changes)
  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
 

+ 5 - 1
src/java/org/apache/hadoop/mapred/JobTracker.java

@@ -41,6 +41,7 @@ import org.apache.hadoop.conf.Configuration;
 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 @@ public class JobTracker implements MRConstants, InterTrackerProtocol, JobSubmiss
         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 @@ public class JobTracker implements MRConstants, InterTrackerProtocol, JobSubmiss
         Configuration conf=new Configuration();
         startTracker(conf);
       } catch ( Throwable e ) {
-        LOG.error( StringUtils.stringifyException( e ) );
+        LOG.fatal( StringUtils.stringifyException( e ) );
         System.exit(-1);
       }
     }