This is an automated email from the ASF dual-hosted git repository.
zhengchenyu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 4a8ba6bf6 [#1698][FOLLOWUP] fix(test): Adjust jvm opts to increase
stability of tests (#1739)
4a8ba6bf6 is described below
commit 4a8ba6bf6754366b4627cd7bcd072d9abcbda10b
Author: RickyMa <[email protected]>
AuthorDate: Tue May 28 11:11:33 2024 +0800
[#1698][FOLLOWUP] fix(test): Adjust jvm opts to increase stability of tests
(#1739)
### What changes were proposed in this pull request?
We adjust the memory arguments refer to Spark's
[pom.xml](https://github.com/apache/spark/blob/master/pom.xml):
> -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs}
and
[make-distribution.sh](https://github.com/apache/spark/blob/master/dev/make-distribution.sh):
> export MAVEN_OPTS="${MAVEN_OPTS:--Xss128m -Xmx4g
-XX:ReservedCodeCacheSize=128m}"
This is more reasonable.
### Why are the changes needed?
Fix: https://github.com/apache/incubator-uniffle/issues/1698.
After https://github.com/apache/incubator-uniffle/pull/1726, I found that
the issue may still exist.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Unnecessary.
---
build_distribution.sh | 2 +-
integration-test/common/pom.xml | 2 +-
integration-test/mr/pom.xml | 2 +-
integration-test/spark-common/pom.xml | 2 +-
integration-test/tez/pom.xml | 3 ++-
pom.xml | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build_distribution.sh b/build_distribution.sh
index 1483be773..44cca9c8f 100755
--- a/build_distribution.sh
+++ b/build_distribution.sh
@@ -160,7 +160,7 @@ fi
echo "RSS version is $VERSION"
-export MAVEN_OPTS="${MAVEN_OPTS:--Xmx2g -XX:ReservedCodeCacheSize=1g}"
+export MAVEN_OPTS="${MAVEN_OPTS:--Xss128m -Xmx5g -XX:ReservedCodeCacheSize=1g}"
# Store the command as an array because $MVN variable might have spaces in it.
# Normal quoting tricks don't work.
diff --git a/integration-test/common/pom.xml b/integration-test/common/pom.xml
index 42097d524..0311a7906 100644
--- a/integration-test/common/pom.xml
+++ b/integration-test/common/pom.xml
@@ -177,7 +177,7 @@
</systemProperties>
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
<useFile>${test.redirectToFile}</useFile>
- <argLine>-ea -Xmx5g</argLine>
+ <argLine>-ea -Xmx5g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=1g</argLine>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
diff --git a/integration-test/mr/pom.xml b/integration-test/mr/pom.xml
index 0eac66864..4e8bdf725 100644
--- a/integration-test/mr/pom.xml
+++ b/integration-test/mr/pom.xml
@@ -161,7 +161,7 @@
</systemProperties>
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
<useFile>${test.redirectToFile}</useFile>
- <argLine>-ea -Xmx5g</argLine>
+ <argLine>-ea -Xmx5g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=1g</argLine>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
diff --git a/integration-test/spark-common/pom.xml
b/integration-test/spark-common/pom.xml
index 3e373410f..40642dd32 100644
--- a/integration-test/spark-common/pom.xml
+++ b/integration-test/spark-common/pom.xml
@@ -194,7 +194,7 @@
</systemProperties>
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
<useFile>${test.redirectToFile}</useFile>
- <argLine>-ea -Xmx5g</argLine>
+ <argLine>-ea -Xmx5g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=1g</argLine>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
diff --git a/integration-test/tez/pom.xml b/integration-test/tez/pom.xml
index 702568abb..325123543 100644
--- a/integration-test/tez/pom.xml
+++ b/integration-test/tez/pom.xml
@@ -157,6 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
<configuration>
<systemProperties>
<java.awt.headless>true</java.awt.headless>
@@ -166,7 +167,7 @@
</systemProperties>
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
<useFile>${test.redirectToFile}</useFile>
- <argLine>-ea -Xmx5g</argLine>
+ <argLine>-ea -Xmx5g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=1g</argLine>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index bf9930641..fe93ceb22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -920,7 +920,7 @@
</systemProperties>
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
<useFile>${test.redirectToFile}</useFile>
- <argLine>${argLine} -ea -Xmx3g</argLine>
+ <argLine>${argLine} -ea -Xmx5g -Xss4m -XX:MaxMetaspaceSize=2g
-XX:ReservedCodeCacheSize=1g</argLine>
<failIfNoTests>false</failIfNoTests>
<trimStackTrace>${trimStackTrace}</trimStackTrace>
<skipTests>${skipUTs}</skipTests>
