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

[tomwhite]

Author: tomwhite
Date: Wed May 18 18:54:46 2011
New Revision: 1124381

URL: http://svn.apache.org/viewvc?rev=1124381&view=rev
Log:
MAPREDUCE-2381. JobTracker instrumentation not consistent about error handling. 
Contributed by Philip Zeyliger.

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

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1124381&r1=1124380&r2=1124381&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed May 18 18:54:46 2011
@@ -106,6 +106,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2502. JobSubmitter should use mapreduce.job.maps instead of
     its deprecated equivalent. (eli via todd)
 
+    MAPREDUCE-2381. JobTracker instrumentation not consistent about error
+    handling. (Philip Zeyliger via tomwhite)
+
   OPTIMIZATIONS
     
     MAPREDUCE-2026. Make JobTracker.getJobCounters() and

Modified: 
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=1124381&r1=1124380&r2=1124381&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java 
(original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java 
Wed May 18 18:54:46 2011
@@ -1521,9 +1521,9 @@ public class JobTracker implements MRCon
 
     // Initialize instrumentation
     JobTrackerInstrumentation tmp;
-    Class<? extends JobTrackerInstrumentation> metricsInst =
-      getInstrumentationClass(jobConf);
     try {
+      Class<? extends JobTrackerInstrumentation> metricsInst =
+        getInstrumentationClass(jobConf);
       java.lang.reflect.Constructor<? extends JobTrackerInstrumentation> c =
         metricsInst.getConstructor(new Class[] {JobTracker.class, 
JobConf.class} );
       tmp = c.newInstance(this, jobConf);
@@ -4728,9 +4728,9 @@ public class JobTracker implements MRCon
 
     // Initialize instrumentation
     JobTrackerInstrumentation tmp;
-    Class<? extends JobTrackerInstrumentation> metricsInst =
-      getInstrumentationClass(conf);
     try {
+      Class<? extends JobTrackerInstrumentation> metricsInst =
+        getInstrumentationClass(conf);
       java.lang.reflect.Constructor<? extends JobTrackerInstrumentation> c =
         metricsInst.getConstructor(new Class[] {JobTracker.class, 
JobConf.class} );
       tmp = c.newInstance(this, conf);