MAPREDUCE-4036. Streaming TestUlimit fails on CentOS 6. (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1368134 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -144,6 +144,8 @@ Release 1.2.0 - unreleased
     HDFS-3163. TestHDFSCLI.testAll fails if user name is not all lowercase.
     (Brandon Li via suresh)
 
+    MAPREDUCE-4036. Streaming TestUlimit fails on CentOS 6. (tucu)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java

@@ -46,7 +46,7 @@ public class TestUlimit extends TestCase {
   MiniDFSCluster dfs = null;
   MiniMRCluster mr = null;
   FileSystem fs = null;
-  private static String SET_MEMORY_LIMIT = "786432"; // 768MB
+  private static String SET_MEMORY_LIMIT = "1786432"; // 1768MB
 
   String[] genArgs(String memLimit) {
     return new String[] {
@@ -57,6 +57,8 @@ public class TestUlimit extends TestCase {
       "-numReduceTasks", "0",
       "-jobconf", "mapred.map.tasks=1",
       "-jobconf", JobConf.MAPRED_MAP_TASK_ULIMIT + "=" + memLimit,
+      "-jobconf", "mapred.child.java.opts=-Xmx512m",
+      "-jobconf", "mapred.child.env=MALLOC_ARENA_MAX=1",
       "-jobconf", "mapred.job.tracker=" + "localhost:" +
                                            mr.getJobTrackerPort(),
       "-jobconf", "fs.default.name=" + "hdfs://localhost:"