Repository: spark Updated Branches: refs/heads/master e84545fa7 -> 6b68366df
[SPARK-8289] Specify stack size for consistency with Java tests - resolves test failures This change is a simple one and specifies a stack size of 4096k instead of the vendor default for Java tests (the defaults vary between Java vendors). This remedies test failures observed with JavaALSSuite with IBM and Oracle Java owing to a lower default size in comparison to the size with OpenJDK. 4096k is a suitable default where the tests pass with each Java vendor tested. The alternative is to reduce the number of iterations in the test (no observed failures with 5 iterations instead of 15). -Xss works with Oracle's HotSpot VM, IBM's J9 VM and OpenJDK (IcedTea). I have ensured this does not have any negative implications for other tests. Author: Adam Roberts <arobe...@uk.ibm.com> Author: a-roberts <arobe...@uk.ibm.com> Closes #6727 from a-roberts/IncJavaStackSize and squashes the following commits: ab40aea [Adam Roberts] Specify stack size for SBT builds 5032d8d [a-roberts] Update pom.xml Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6b68366d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6b68366d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6b68366d Branch: refs/heads/master Commit: 6b68366df345d4572cf138f9efe17e23d0d1971e Parents: e84545f Author: Adam Roberts <arobe...@uk.ibm.com> Authored: Thu Jun 11 08:40:46 2015 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Jun 11 08:40:46 2015 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- project/SparkBuild.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6b68366d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e9700a5..6d4f717 100644 --- a/pom.xml +++ b/pom.xml @@ -1244,7 +1244,7 @@ <include>**/*Suite.java</include> </includes> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> - <argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> + <argLine>-Xmx3g -Xss4096k -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> <environmentVariables> <!-- Setting SPARK_DIST_CLASSPATH is a simple way to make sure any child processes http://git-wip-us.apache.org/repos/asf/spark/blob/6b68366d/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d7e3745..aa75a64 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -514,7 +514,7 @@ object TestSettings { javaOptions in Test ++= System.getProperties.filter(_._1 startsWith "spark") .map { case (k,v) => s"-D$k=$v" }.toSeq, javaOptions in Test += "-ea", - javaOptions in Test ++= "-Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g" + javaOptions in Test ++= "-Xmx3g -Xss4096k -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g" .split(" ").toSeq, javaOptions += "-Xmx3g", // Show full stack trace and duration in test cases. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
