svn commit: r1041095 - /incubator/whirr/trunk/scripts/apache/hadoop/post-configure

[to...@apache.org]

Author: tomwhite
Date: Wed Dec  1 17:29:08 2010
New Revision: 1041095

URL: http://svn.apache.org/viewvc?rev=1041095&view=rev
Log:
Reverted changes to scripts/apache/hadoop/post-configure from WHIRR-146

Modified:
    incubator/whirr/trunk/scripts/apache/hadoop/post-configure

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