This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9321e322d2a HADOOP-19310. Add JPMS options required by Java 17+
(#7114) Contributed by Cheng Pan.
9321e322d2a is described below
commit 9321e322d2a37f37e8ff905ee51da9aa877ab452
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Wed Oct 16 14:15:01 2024 +0800
HADOOP-19310. Add JPMS options required by Java 17+ (#7114) Contributed by
Cheng Pan.
Reviewed-by: Attila Doroszlai <adorosz...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../hadoop-common/src/main/bin/hadoop-functions.sh | 9 +++++++++
hadoop-common-project/hadoop-registry/pom.xml | 2 +-
hadoop-project/pom.xml | 11 +++++++++++
hadoop-tools/hadoop-distcp/pom.xml | 2 +-
hadoop-tools/hadoop-federation-balance/pom.xml | 2 +-
.../hadoop-yarn-server-timelineservice-hbase-tests/pom.xml | 2 ++
6 files changed, 25 insertions(+), 3 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index a79e2cd1c6d..d90ef05d797 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -1571,12 +1571,21 @@ function hadoop_finalize_hadoop_opts
## @description Finish configuring JPMS that enforced for JDK 17 and higher
## @description prior to executing Java
+## @description keep this list sync with hadoop-project/pom.xml
extraJavaTestArgs
## @audience private
## @stability evolving
## @replaceable yes
function hadoop_finalize_jpms_opts
{
hadoop_add_param HADOOP_OPTS IgnoreUnrecognizedVMOptions
"-XX:+IgnoreUnrecognizedVMOptions"
+ hadoop_add_param HADOOP_OPTS open.java.io
"--add-opens=java.base/java.io=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.lang
"--add-opens=java.base/java.lang=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.lang.reflect
"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.math
"--add-opens=java.base/java.math=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.net
"--add-opens=java.base/java.net=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.text
"--add-opens=java.base/java.text=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.util
"--add-opens=java.base/java.util=ALL-UNNAMED"
+ hadoop_add_param HADOOP_OPTS open.java.util.concurrent
"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
hadoop_add_param HADOOP_OPTS open.java.util.zip
"--add-opens=java.base/java.util.zip=ALL-UNNAMED"
hadoop_add_param HADOOP_OPTS open.sun.security.util
"--add-opens=java.base/sun.security.util=ALL-UNNAMED"
hadoop_add_param HADOOP_OPTS open.sun.security.x509
"--add-opens=java.base/sun.security.x509=ALL-UNNAMED"
diff --git a/hadoop-common-project/hadoop-registry/pom.xml
b/hadoop-common-project/hadoop-registry/pom.xml
index 3d01f37db55..8a6f47e07da 100644
--- a/hadoop-common-project/hadoop-registry/pom.xml
+++ b/hadoop-common-project/hadoop-registry/pom.xml
@@ -233,7 +233,7 @@
<configuration>
<reuseForks>false</reuseForks>
<forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
- <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine>
+ <argLine>${maven-surefire-plugin.argLine} -Xmx1024m
-XX:+HeapDumpOnOutOfMemoryError</argLine>
<environmentVariables>
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
<HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 638740c9a03..faf76544aff 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -167,8 +167,19 @@
<enforced.java.version>[${javac.version},)</enforced.java.version>
<enforced.maven.version>[3.3.0,)</enforced.maven.version>
+ <!-- keep this list sync with
+
hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh#hadoop_finalize_jpms_opts
+ -->
<extraJavaTestArgs>
-XX:+IgnoreUnrecognizedVMOptions
+ --add-opens=java.base/java.io=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+ --add-opens=java.base/java.math=ALL-UNNAMED
+ --add-opens=java.base/java.net=ALL-UNNAMED
+ --add-opens=java.base/java.text=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util.zip=ALL-UNNAMED
--add-opens=java.base/sun.security.util=ALL-UNNAMED
--add-opens=java.base/sun.security.x509=ALL-UNNAMED
diff --git a/hadoop-tools/hadoop-distcp/pom.xml
b/hadoop-tools/hadoop-distcp/pom.xml
index fd592d2395e..fdc2993a99a 100644
--- a/hadoop-tools/hadoop-distcp/pom.xml
+++ b/hadoop-tools/hadoop-distcp/pom.xml
@@ -143,7 +143,7 @@
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <argLine>-Xmx1024m</argLine>
+ <argLine>${maven-surefire-plugin.argLine} -Xmx1024m</argLine>
<includes>
<include>**/Test*.java</include>
</includes>
diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml
b/hadoop-tools/hadoop-federation-balance/pom.xml
index 00af8535689..6669fb0428e 100644
--- a/hadoop-tools/hadoop-federation-balance/pom.xml
+++ b/hadoop-tools/hadoop-federation-balance/pom.xml
@@ -147,7 +147,7 @@
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <argLine>-Xmx1024m</argLine>
+ <argLine>${maven-surefire-plugin.argLine} -Xmx1024m</argLine>
<includes>
<include>**/Test*.java</include>
</includes>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index b981270d6df..11433ed38c4 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -491,6 +491,8 @@
</plugin>
<!-- The fork value is deliberately set to 0 to avoid VM crash while
running tests
on Jenkins, removing this leads to tests crashing silently due to VM
crash -->
+ <!-- TODO: we should investigate and address the crash issue and
re-enable fork,
+ otherwise, JPMS args does not take effect -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
