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 om...@apache.org on 2011/06/17 00:25:43 UTC
svn commit: r1136711 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Author: omalley
Date: Thu Jun 16 22:25:42 2011
New Revision: 1136711
URL: http://svn.apache.org/viewvc?rev=1136711&view=rev
Log:
MAPREDUCE-2555. Avoid sprious logging from completedtasks. (Thomas Graves
via cdouglas)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136711&r1=1136710&r2=1136711&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 22:25:42 2011
@@ -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)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 22:25:42 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1131286,1131290,1131299,1131737,1134140
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1131277,1131286,1131290,1131299,1131737,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1132788,1133133,1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1136711&r1=1136710&r2=1136711&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Thu Jun 16 22:25:42 2011
@@ -3215,7 +3215,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 {
@@ -3293,7 +3298,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);
}