Author: tomwhite
Date: Wed Jan 23 11:06:39 2013
New Revision: 1437343
URL: http://svn.apache.org/viewvc?rev=1437343&view=rev
Log:
MAPREDUCE-4929. mapreduce.task.timeout is ignored. Contributed by Sandy Ryza.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
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=1437343&r1=1437342&r2=1437343&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Jan 23 11:06:39 2013
@@ -441,6 +441,9 @@ Release 1.2.0 - unreleased
HADOOP-8580. ant compile-native fails with automake version 1.11.3.
(Gera Shegalov via suresh)
+
+ MAPREDUCE-4929. mapreduce.task.timeout is ignored.
+ (Sandy Ryza via tomwhite)
Release 1.1.2 - Unreleased
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=1437343&r1=1437342&r2=1437343&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 Jan 23 11:06:39 2013
@@ -2805,7 +2805,11 @@ public class TaskTracker implements MRCo
this.localJobConf = lconf;
keepFailedTaskFiles = localJobConf.getKeepFailedTaskFiles();
taskTimeout = localJobConf.getLong("mapred.task.timeout",
- 10 * 60 * 1000);
+ Integer.MIN_VALUE);
+ if (taskTimeout == Integer.MIN_VALUE) {
+ taskTimeout = localJobConf.getLong("mapreduce.task.timeout",
+ 10 * 60 * 1000);
+ }
if (task.isMapTask()) {
debugCommand = localJobConf.getMapDebugScript();
} else {
