You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/11/30 17:29:56 UTC
svn commit: r1040616 - in /incubator/whirr/trunk: CHANGES.txt scripts/apache/hadoop/post-configure scripts/cloudera/cdh/post-configure

Author: tomwhite
Date: Tue Nov 30 16:29:56 2010
New Revision: 1040616

URL: http://svn.apache.org/viewvc?rev=1040616&view=rev
Log:
WHIRR-146. Changing the mapred.child.java.opts value does not change the heap size from a default one. Contributed by Tibor Kiss.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/scripts/apache/hadoop/post-configure
    incubator/whirr/trunk/scripts/cloudera/cdh/post-configure

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1040616&r1=1040615&r2=1040616&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Tue Nov 30 16:29:56 2010
@@ -15,6 +15,9 @@ Trunk (unreleased changes)
 
     WHIRR-137. Allow use of an arbitrary AMI on EC2. (tomwhite)
 
+    WHIRR-146. Changing the mapred.child.java.opts value does not change the
+    heap size from a default one. (Tibor Kiss via tomwhite)
+
 Release 0.2.0 - 2010-11-04
 
   NEW FEATURES

Modified: incubator/whirr/trunk/scripts/apache/hadoop/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hadoop/post-configure?rev=1040616&r1=1040615&r2=1040616&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hadoop/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hadoop/post-configure Tue Nov 30 16:29:56 2010
@@ -105,8 +105,10 @@ function configure_hadoop() {
   MAPRED_LOCAL_DIR=$MOUNT/hadoop/mapred/local
   MAX_MAP_TASKS=2
   MAX_REDUCE_TASKS=1
-  CHILD_OPTS=-Xmx550m
-  CHILD_ULIMIT=1126400
+  CHILD_MAP_OPTS=-Xmx550m
+  CHILD_REDUCE_OPTS=-Xmx550m
+  CHILD_MAP_ULIMIT=1126400
+  CHILD_REDUCE_ULIMIT=1126400
   TMP_DIR=$MOUNT/tmp/hadoop-\${user.name}
 
   mkdir -p $MOUNT/hadoop
@@ -197,12 +199,21 @@ function configure_hadoop() {
   <value>65536</value>
 </property>
 <property>
-  <name>mapred.child.java.opts</name>
-  <value>$CHILD_OPTS</value>
+  <name>mapred.map.child.java.opts</name>
+  <value>$CHILD_MAP_OPTS</value>
 </property>
 <property>
-  <name>mapred.child.ulimit</name>
-  <value>$CHILD_ULIMIT</value>
+  <name>mapred.reduce.child.java.opts</name>
+  <value>$CHILD_REDUCE_OPTS</value>
+</property>
+<property>
+  <name>mapred.map.child.ulimit</name>
+  <value>$CHILD_MAP_ULIMIT</value>
+  <final>true</final>
+</property>
+<property>
+  <name>mapred.reduce.child.ulimit</name>
+  <value>$CHILD_REDUCE_ULIMIT</value>
   <final>true</final>
 </property>
 <property>

Modified: incubator/whirr/trunk/scripts/cloudera/cdh/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/cloudera/cdh/post-configure?rev=1040616&r1=1040615&r2=1040616&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/cloudera/cdh/post-configure (original)
+++ incubator/whirr/trunk/scripts/cloudera/cdh/post-configure Tue Nov 30 16:29:56 2010
@@ -124,8 +124,10 @@ function configure_hadoop() {
   MAPRED_LOCAL_DIR=$MOUNT/hadoop/mapred/local
   MAX_MAP_TASKS=2
   MAX_REDUCE_TASKS=1
-  CHILD_OPTS=-Xmx550m
-  CHILD_ULIMIT=1126400
+  CHILD_MAP_OPTS=-Xmx550m
+  CHILD_REDUCE_OPTS=-Xmx550m
+  CHILD_MAP_ULIMIT=1126400
+  CHILD_REDUCE_ULIMIT=1126400
   TMP_DIR=$MOUNT/tmp/hadoop-\${user.name}
 
   mkdir -p $MOUNT/hadoop
@@ -214,12 +216,21 @@ function configure_hadoop() {
   <value>65536</value>
 </property>
 <property>
-  <name>mapred.child.java.opts</name>
-  <value>$CHILD_OPTS</value>
+  <name>mapred.map.child.java.opts</name>
+  <value>$CHILD_MAP_OPTS</value>
 </property>
 <property>
-  <name>mapred.child.ulimit</name>
-  <value>$CHILD_ULIMIT</value>
+  <name>mapred.reduce.child.java.opts</name>
+  <value>$CHILD_REDUCE_OPTS</value>
+</property>
+<property>
+  <name>mapred.map.child.ulimit</name>
+  <value>$CHILD_MAP_ULIMIT</value>
+  <final>true</final>
+</property>
+<property>
+  <name>mapred.reduce.child.ulimit</name>
+  <value>$CHILD_REDUCE_ULIMIT</value>
   <final>true</final>
 </property>
 <property>