Author: sandy
Date: Wed May 7 00:50:21 2014
New Revision: 1592928
URL: http://svn.apache.org/r1592928
Log:
MAPREDUCE-5877. Inconsistency between JT/TT for tasks taking a long time to
launch (Karthik Kambatla via Sandy Ryza)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1592928&r1=1592927&r2=1592928&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed May 7 00:50:21 2014
@@ -215,6 +215,9 @@ Release 1.3.0 - unreleased
in AbstractDelegationTokenSecretManager. (Suresh Srinivas via
Arpit Agarwal)
+ MAPREDUCE-5877. Inconsistency between JT/TT for tasks taking a long time to
+ launch (Karthik Kambatla via Sandy Ryza)
+
Release 1.2.2 - unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1592928&r1=1592927&r2=1592928&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Wed May 7 00:50:21 2014
@@ -4420,12 +4420,10 @@ public class JobTracker implements MRCon
for (TaskStatus report : status.getTaskReports()) {
report.setTaskTracker(trackerName);
TaskAttemptID taskId = report.getTaskID();
-
- // don't expire the task if it is not unassigned
- if (report.getRunState() != TaskStatus.State.UNASSIGNED) {
- expireLaunchingTasks.removeTask(taskId);
- }
-
+
+ // Remove task from the list of tasks to be expired.
+ expireLaunchingTasks.removeTask(taskId);
+
JobInProgress job = getJob(taskId.getJobID());
if (job == null) {
// if job is not there in the cleanup list ... add it
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1592928&r1=1592927&r2=1592928&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Wed May 7 00:50:21 2014
@@ -2249,6 +2249,7 @@ public class TaskTracker implements MRCo
long now = System.currentTimeMillis();
for (TaskInProgress tip: runningTasks.values()) {
if (tip.getRunState() == TaskStatus.State.RUNNING ||
+ tip.getRunState() == TaskStatus.State.UNASSIGNED ||
tip.getRunState() == TaskStatus.State.COMMIT_PENDING ||
tip.isCleaningup()) {
// Check the per-job timeout interval for tasks;
