[SPARK-26306][TEST][BUILD] More memory to de-flake SorterSuite

## What changes were proposed in this pull request?

Increase test memory to avoid OOM in TimSort-related tests.

## How was this patch tested?

Existing tests.

Closes #23425 from srowen/SPARK-26306.

Authored-by: Sean Owen <sean.owen@databricks.com>
Signed-off-by: Sean Owen <sean.owen@databricks.com>
This commit is contained in:
Sean Owen 2019-01-04 15:35:23 -06:00
parent 4419e1daca
commit 36440e6447
4 changed files with 5 additions and 5 deletions

View file

@ -2115,7 +2115,7 @@
<include>**/*Suite.java</include> <include>**/*Suite.java</include>
</includes> </includes>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<argLine>-ea -Xmx3g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> <argLine>-ea -Xmx4g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine>
<environmentVariables> <environmentVariables>
<!-- <!--
Setting SPARK_DIST_CLASSPATH is a simple way to make sure any child processes Setting SPARK_DIST_CLASSPATH is a simple way to make sure any child processes
@ -2165,7 +2165,7 @@
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml> <junitxml>.</junitxml>
<filereports>SparkTestSuite.txt</filereports> <filereports>SparkTestSuite.txt</filereports>
<argLine>-ea -Xmx3g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> <argLine>-ea -Xmx4g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine>
<stderr/> <stderr/>
<environmentVariables> <environmentVariables>
<!-- <!--

View file

@ -888,7 +888,7 @@ object TestSettings {
javaOptions in Test ++= System.getProperties.asScala.filter(_._1.startsWith("spark")) javaOptions in Test ++= System.getProperties.asScala.filter(_._1.startsWith("spark"))
.map { case (k,v) => s"-D$k=$v" }.toSeq, .map { case (k,v) => s"-D$k=$v" }.toSeq,
javaOptions in Test += "-ea", javaOptions in Test += "-ea",
javaOptions in Test ++= "-Xmx3g -Xss4m" javaOptions in Test ++= "-Xmx4g -Xss4m"
.split(" ").toSeq, .split(" ").toSeq,
javaOptions += "-Xmx3g", javaOptions += "-Xmx3g",
// Exclude tags defined in a system property // Exclude tags defined in a system property

View file

@ -135,7 +135,7 @@
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml> <junitxml>.</junitxml>
<filereports>SparkTestSuite.txt</filereports> <filereports>SparkTestSuite.txt</filereports>
<argLine>-ea -Xmx3g -XX:ReservedCodeCacheSize=512m ${extraScalaTestArgs}</argLine> <argLine>-ea -Xmx4g -XX:ReservedCodeCacheSize=512m ${extraScalaTestArgs}</argLine>
<stderr/> <stderr/>
<systemProperties> <systemProperties>
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration> <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>

View file

@ -229,7 +229,7 @@
<artifactId>scalatest-maven-plugin</artifactId> <artifactId>scalatest-maven-plugin</artifactId>
<configuration> <configuration>
<!-- Specially disable assertions since some Hive tests fail them --> <!-- Specially disable assertions since some Hive tests fail them -->
<argLine>-da -Xmx3g -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> <argLine>-da -Xmx4g -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>