MAPREDUCE-2555. Avoid sprious logging from completedtasks. (Thomas Graves

via cdouglas)


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

CHANGES.txt

@@ -11,6 +11,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-2555. Avoid sprious logging from completedtasks. (Thomas Graves
+    via cdouglas)
+
     MAPREDUCE-2535. Fix NPE in JobClient caused by retirement. (Robert Joseph
     Evans via cdouglas)
 

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

@@ -3215,7 +3215,12 @@ public class TaskTracker implements MRConstants, TaskUmbilicalProtocol,
     authorizeJVM(taskid.getJobID());
     TaskInProgress tip = tasks.get(taskid);
     if (tip != null) {
-      validateJVM(tip, jvmContext, taskid);
+      try {
+        validateJVM(tip, jvmContext, taskid);
+      } catch (IOException ie) {
+        LOG.warn("Failed validating JVM", ie);
+        return false;
+      }
       tip.reportProgress(taskStatus);
       return true;
     } else {
@@ -3293,7 +3298,9 @@ public class TaskTracker implements MRConstants, TaskUmbilicalProtocol,
     LOG.info("Task " + taskid + " is in commit-pending," +"" +
              " task state:" +taskStatus.getRunState());
     // validateJVM is done in statusUpdate
-    statusUpdate(taskid, taskStatus, jvmContext);
+    if (!statusUpdate(taskid, taskStatus, jvmContext)) {
+      throw new IOException("Task not found for taskid: " + taskid);
+    }
     reportTaskFinished(taskid, true);
   }