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 dd...@apache.org on 2007/12/03 12:43:25 UTC
svn commit: r600492 - in /lucene/hadoop/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/TaskTracker.java
Author: ddas
Date: Mon Dec 3 03:43:22 2007
New Revision: 600492
URL: http://svn.apache.org/viewvc?rev=600492&view=rev
Log:
HADOOP-2300. This fixes a bug where mapred.tasktracker.tasks.maximum would be ignored even if it was set in hadoop-site.xml. Contributed by Amareshwari Sri Ramadasu.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=600492&r1=600491&r2=600492&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Mon Dec 3 03:43:22 2007
@@ -175,6 +175,10 @@
HADOOP-2314. Prevent TestBlockReplacement from occasionally getting
into an infinite loop. (Hairong Kuang via dhruba)
+ HADOOP-2300. This fixes a bug where mapred.tasktracker.tasks.maximum
+ would be ignored even if it was set in hadoop-site.xml.
+ (Amareshwari Sri Ramadasu via ddas)
+
Branch 0.15 (unreleased)
BUG FIXES
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=600492&r1=600491&r2=600492&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java Mon Dec 3 03:43:22 2007
@@ -713,14 +713,14 @@
String oldMax,
int def) {
try {
- if (newMax != null) {
- return Integer.parseInt(newMax);
- }
if (oldMax != null ) {
LOG.warn("mapred.tasktracker.tasks.maximum is deprecated. Use " +
"mapred.tasktracker.map.tasks.maximum and " +
"mapred.tasktracker.reduce.tasks.maximum instead.");
return Integer.parseInt(oldMax);
+ }
+ if (newMax != null) {
+ return Integer.parseInt(newMax);
}
} catch (NumberFormatException ne) {
return def;