Return-Path: 
 <common-commits-return-13371-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: (qmail 48112 invoked from network); 4 Mar 2011 04:39:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Mar 2011 04:39:55 -0000
Received: (qmail 76889 invoked by uid 500); 4 Mar 2011 04:39:54 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 76849 invoked by uid 500); 4 Mar 2011 04:39:54 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 76816 invoked by uid 99); 4 Mar 2011 04:39:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:39:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 04 Mar 2011 04:39:53 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 96A322388AAA; Fri,  4 Mar 2011 04:39:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1077642 -
 /hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml
Date: Fri, 04 Mar 2011 04:39:33 -0000
To: common-commits@hadoop.apache.org
From: omalley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110304043933.96A322388AAA@eris.apache.org>

Author: omalley
Date: Fri Mar  4 04:39:33 2011
New Revision: 1077642

URL: http://svn.apache.org/viewvc?rev=1077642&view=rev
Log:
commit f0edf256f0d3d956dd33e050105905b8be457ece
Author: Arun C Murthy <acmurthy@apache.org>
Date:   Thu Aug 5 09:06:26 2010 -0700

    Added job memory management knobs to mapred-default.xml

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml?rev=1077642&r1=1077641&r2=1077642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/mapred-default.xml Fri Mar  4 04:39:33 2011
@@ -438,6 +438,79 @@
 </property>
 
 <property>
+  <name>mapred.cluster.map.memory.mb</name>
+  <value>-1</value>
+  <description>The size, in terms of virtual memory, of a single map slot 
+  in the Map-Reduce framework, used by the scheduler. 
+  A job can ask for multiple slots for a single map task via 
+  mapred.job.map.memory.mb, upto the limit specified by 
+  mapred.cluster.max.map.memory.mb, if the scheduler supports the feature. 
+  The value of -1 indicates that this feature is turned off.
+  </description>
+</property>
+
+<property>
+  <name>mapred.cluster.reduce.memory.mb</name>
+  <value>-1</value>
+  <description>The size, in terms of virtual memory, of a single reduce slot 
+  in the Map-Reduce framework, used by the scheduler. 
+  A job can ask for multiple slots for a single reduce task via 
+  mapred.job.reduce.memory.mb, upto the limit specified by 
+  mapred.cluster.max.reduce.memory.mb, if the scheduler supports the feature. 
+  The value of -1 indicates that this feature is turned off.
+  </description>
+</property>
+
+<property>
+  <name>mapred.cluster.max.map.memory.mb</name>
+  <value>-1</value>
+  <description>The maximum size, in terms of virtual memory, of a single map 
+  task launched by the Map-Reduce framework, used by the scheduler. 
+  A job can ask for multiple slots for a single map task via 
+  mapred.job.map.memory.mb, upto the limit specified by 
+  mapred.cluster.max.map.memory.mb, if the scheduler supports the feature. 
+  The value of -1 indicates that this feature is turned off.
+  </description>
+</property>
+
+<property>
+  <name>mapred.cluster.max.reduce.memory.mb</name>
+  <value>-1</value>
+  <description>The maximum size, in terms of virtual memory, of a single reduce 
+  task launched by the Map-Reduce framework, used by the scheduler. 
+  A job can ask for multiple slots for a single reduce task via 
+  mapred.job.reduce.memory.mb, upto the limit specified by 
+  mapred.cluster.max.reduce.memory.mb, if the scheduler supports the feature. 
+  The value of -1 indicates that this feature is turned off.
+  </description>
+</property>
+
+<property>
+  <name>mapred.job.map.memory.mb</name>
+  <value>-1</value>
+  <description>The size, in terms of virtual memory, of a single map task 
+  for the job.
+  A job can ask for multiple slots for a single map task, rounded up to the 
+  next multiple of mapred.cluster.map.memory.mb and upto the limit 
+  specified by mapred.cluster.max.map.memory.mb, if the scheduler supports 
+  the feature. 
+  The value of -1 indicates that this feature is turned off.
+  </description>
+</property>
+
+<property>
+  <name>mapred.job.reduce.memory.mb</name>
+  <value>-1</value>
+  <description>The size, in terms of virtual memory, of a single reduce task 
+  for the job.
+  A job can ask for multiple slots for a single map task, rounded up to the 
+  next multiple of mapred.cluster.reduce.memory.mb and upto the limit 
+  specified by mapred.cluster.max.reduce.memory.mb, if the scheduler supports 
+  the feature. 
+  The value of -1 indicates that this feature is turned off.  </description>
+</property>
+
+<property>
   <name>mapred.child.tmp</name>
   <value>./tmp</value>
   <description> To set the value of tmp directory for map and reduce tasks.