You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2008/05/12 20:28:20 UTC
svn commit: r655589 - in /hadoop/core/trunk: CHANGES.txt
src/contrib/build-contrib.xml
src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java
Author: cdouglas
Date: Mon May 12 11:28:19 2008
New Revision: 655589
URL: http://svn.apache.org/viewvc?rev=655589&view=rev
Log:
HADOOP-3372. Fix heap management in streaming tests. Contributed by Arun Murthy.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/build-contrib.xml
hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=655589&r1=655588&r2=655589&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon May 12 11:28:19 2008
@@ -800,6 +800,10 @@
HADOOP-3285. Fix input split locality when the splits align to
fs blocks. (omalley)
+ HADOOP-3372. Fix heap management in streaming tests. (Arun Murthy via
+ cdouglas)
+
+
Release 0.16.4 - 2008-05-05
BUG FIXES
Modified: hadoop/core/trunk/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/build-contrib.xml?rev=655589&r1=655588&r2=655589&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/core/trunk/src/contrib/build-contrib.xml Mon May 12 11:28:19 2008
@@ -193,7 +193,7 @@
<mkdir dir="${hadoop.log.dir}"/>
<junit
printsummary="yes" showoutput="${test.output}"
- haltonfailure="no" fork="yes" maxmemory="1280m"
+ haltonfailure="no" fork="yes" maxmemory="256m"
errorProperty="tests.failed" failureProperty="tests.failed"
timeout="${test.timeout}">
Modified: hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java?rev=655589&r1=655588&r2=655589&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java Mon May 12 11:28:19 2008
@@ -385,6 +385,9 @@
vargs.add("-classpath");
vargs.add("\"" + System.getProperty("java.class.path") + "\"");
+ // add heap-size limit
+ vargs.add("-Xmx" + Runtime.getRuntime().maxMemory());
+
// Add main class and its arguments
vargs.add(main.getName());
for (int i = 0; i < argv.length; i++) {
Modified: hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java?rev=655589&r1=655588&r2=655589&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java (original)
+++ hadoop/core/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java Mon May 12 11:28:19 2008
@@ -65,11 +65,6 @@
out.close();
}
- public void tearDown() {
- UtilTest.recursiveDelete(INPUT_FILE);
- UtilTest.recursiveDelete(OUTPUT_DIR);
- }
-
public void runStreamJob(boolean exitStatusIsFailure, boolean failMap) {
try {
boolean mayExit = false;