Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 85168 invoked from network); 3 Dec 2007 11:43:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Dec 2007 11:43:48 -0000 Received: (qmail 3370 invoked by uid 500); 3 Dec 2007 11:43:36 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 3345 invoked by uid 500); 3 Dec 2007 11:43:35 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 3336 invoked by uid 99); 3 Dec 2007 11:43:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2007 03:43:35 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2007 11:43:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C809A1A9832; Mon, 3 Dec 2007 03:43:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600492 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskTracker.java Date: Mon, 03 Dec 2007 11:43:25 -0000 To: hadoop-commits@lucene.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071203114326.C809A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;