svn commit: r1577556 - in /hadoop/common/branches/branch-2.4/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

[jlowe]

Author: jlowe
Date: Fri Mar 14 14:48:21 2014
New Revision: 1577556

URL: http://svn.apache.org/r1577556
Log:
svn merge -c 1577554 FIXES: MAPREDUCE-5751. MR app master fails to start in 
some cases if mapreduce.job.classloader is true. Contributed by Sangjin Lee

Modified:
    hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java

Modified: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt?rev=1577556&r1=1577555&r2=1577556&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt Fri 
Mar 14 14:48:21 2014
@@ -64,6 +64,9 @@ Release 2.4.0 - UNRELEASED
     MAPREDUCE-5794. SliveMapper always uses default FileSystem. (szetszwo via
     Arpit Agarwal)
 
+    MAPREDUCE-5751. MR app master fails to start in some cases if
+    mapreduce.job.classloader is true (Sangjin Lee via jlowe)
+
 Release 2.3.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1577556&r1=1577555&r2=1577556&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 (original)
+++ 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
 Fri Mar 14 14:48:21 2014
@@ -1066,6 +1066,8 @@ public class MRAppMaster extends Composi
     //start all the components
     super.serviceStart();
 
+    // set job classloader if configured
+    MRApps.setJobClassLoader(getConfig());
     // All components have started, start the job.
     startJobs();
   }
@@ -1376,8 +1378,6 @@ public class MRAppMaster extends Composi
       // SIGTERM I have a chance to write out the job history. I'll be closing
       // the objects myself.
       conf.setBoolean("fs.automatic.close", false);
-      // set job classloader if configured
-      MRApps.setJobClassLoader(conf);
       initAndStartAppMaster(appMaster, conf, jobUserName);
     } catch (Throwable t) {
       LOG.fatal("Error starting MRAppMaster", t);