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.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@600492 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -175,6 +175,10 @@ Trunk (unreleased changes)
     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

src/java/org/apache/hadoop/mapred/TaskTracker.java

@@ -713,15 +713,15 @@ public class TaskTracker
                                        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;
     }