Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 29785 invoked from network); 20 Jan 2011 00:03:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2011 00:03:33 -0000 Received: (qmail 19003 invoked by uid 500); 20 Jan 2011 00:03:33 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 18895 invoked by uid 500); 20 Jan 2011 00:03:32 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 18887 invoked by uid 99); 20 Jan 2011 00:03:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 00:03:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 00:03:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A3C0323888CF; Thu, 20 Jan 2011 00:03:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061068 - in /hadoop/mapreduce/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskRunner.java Date: Thu, 20 Jan 2011 00:03:11 -0000 To: mapreduce-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110120000311.A3C0323888CF@eris.apache.org> Author: todd Date: Thu Jan 20 00:03:11 2011 New Revision: 1061068 URL: http://svn.apache.org/viewvc?rev=1061068&view=rev Log: MAPREDUCE-1085. For tasks, "ulimit -v -1" is being run when user doesn't specify a ulimit. Contributed by Todd Lipcon Modified: hadoop/mapreduce/trunk/CHANGES.txt hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Modified: hadoop/mapreduce/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1061068&r1=1061067&r2=1061068&view=diff ============================================================================== --- hadoop/mapreduce/trunk/CHANGES.txt (original) +++ hadoop/mapreduce/trunk/CHANGES.txt Thu Jan 20 00:03:11 2011 @@ -476,6 +476,9 @@ Release 0.22.0 - Unreleased MAPREDUCE-2248. DistributedRaidFileSystem should unraid only the corrupt block (Ramkumar Vadali via schen) + MAPREDUCE-1085. For tasks, "ulimit -v -1" is being run when user doesn't + specify a ulimit (todd) + Release 0.21.1 - Unreleased NEW FEATURES Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java?rev=1061068&r1=1061067&r2=1061068&view=diff ============================================================================== --- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java (original) +++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Thu Jan 20 00:03:11 2011 @@ -313,8 +313,13 @@ abstract class TaskRunner extends Thread * @return */ private List getVMSetupCmd() { - String[] ulimitCmd = Shell.getUlimitMemoryCommand(getChildUlimit(conf)); + + int ulimit = getChildUlimit(conf); + if (ulimit <= 0) { + return null; + } List setup = null; + String[] ulimitCmd = Shell.getUlimitMemoryCommand(ulimit); if (ulimitCmd != null) { setup = new ArrayList(); for (String arg : ulimitCmd) {