MAPREDUCE-2447. Fix Child.java to set Task.jvmContext sooner to avoid corner cases in error handling. Contributed by Siddharth Seth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1096076 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -4,6 +4,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-2447. Fix Child.java to set Task.jvmContext sooner to avoid
+    corner cases in error handling. (Siddharth Seth via acmurthy) 
+
     MAPREDUCE-2429. Validate JVM in TaskUmbilicalProtocol. (Siddharth Seth via
     acmurthy) 
 

src/mapred/org/apache/hadoop/mapred/Child.java

@@ -195,6 +195,7 @@ class Child {
         }
         idleLoopCount = 0;
         task = myTask.getTask();
+        task.setJvmContext(jvmContext);
         taskid = task.getTaskID();
 
         // Create the JobConf and determine if this job gets segmented task logs
@@ -251,7 +252,6 @@ class Child {
         
         // Create a final reference to the task for the doAs block
         final Task taskFinal = task;
-        taskFinal.setJvmContext(jvmContext);
         childUGI.doAs(new PrivilegedExceptionAction<Object>() {
           @Override
           public Object run() throws Exception {

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -3116,6 +3116,10 @@ public class TaskTracker implements MRConstants, TaskUmbilicalProtocol,
   }
   
   private void validateJVM(TaskInProgress tip, JvmContext jvmContext, TaskAttemptID taskid) throws IOException {
+    if (jvmContext == null) {
+      LOG.warn("Null jvmContext. Cannot verify Jvm. validateJvm throwing exception");
+      throw new IOException("JvmValidate Failed. JvmContext is null - cannot validate JVM");
+    }
     if (!jvmManager.validateTipToJvm(tip, jvmContext.jvmId)) {
       throw new IOException("JvmValidate Failed. Ignoring request from task: " + taskid + ", with JvmId: " + jvmContext.jvmId);
     }

src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java

@@ -84,7 +84,7 @@ public interface TaskUmbilicalProtocol extends VersionedProtocol {
    * @return True if the task is known
    */
   boolean statusUpdate(TaskAttemptID taskId, TaskStatus taskStatus,
-      JvmContext context) throws IOException, InterruptedException;
+      JvmContext jvmContext) throws IOException, InterruptedException;
   
   /** Report error messages back to parent.  Calls should be sparing, since all
    *  such messages are held in the job tracker.