You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2011/06/04 00:42:50 UTC
svn commit: r1131277 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Author: cdouglas
Date: Fri Jun 3 22:42:50 2011
New Revision: 1131277
URL: http://svn.apache.org/viewvc?rev=1131277&view=rev
Log:
MAPREDUCE-2555. Avoid sprious logging from completedtasks. Contributed by Thomas Graves
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1131277&r1=1131276&r2=1131277&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Jun 3 22:42:50 2011
@@ -41,6 +41,9 @@ Release 0.20.205.0 - unreleased
MAPREDUCE-2495. exit() the TaskTracker when the distributed cache cleanup
thread dies. (Robert Joseph Evans via cdouglas)
+ MAPREDUCE-2555. Avoid sprious logging from completedtasks. (Thomas Graves
+ via cdouglas)
+
Release 0.20.204.0 - unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1131277&r1=1131276&r2=1131277&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Fri Jun 3 22:42:50 2011
@@ -3208,7 +3208,12 @@ public class TaskTracker implements MRCo
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 {
@@ -3286,7 +3291,9 @@ public class TaskTracker implements MRCo
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);
}