Skip to content

Commit cb82149

Browse files
stotypetersomogyi
authored andcommitted
HBASE-28261 Sync jvm11 module flags from hbase-surefire.jdk11.flags to bin/hbase (#5610)
Signed-off-by: Nihal Jain <nihaljain@apache.org> Signed-off-by: Peter Somogyi <psomogyi@apache.org> (cherry picked from commit 0916c72)
1 parent b361694 commit cb82149

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

bin/hbase

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ add_jdk11_deps_to_classpath() {
484484
}
485485

486486
add_jdk11_jvm_flags() {
487-
HBASE_OPTS="$HBASE_OPTS -Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true --add-modules jdk.unsupported --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-exports java.base/sun.net.dns=ALL-UNNAMED --add-exports java.base/sun.net.util=ALL-UNNAMED"
487+
# Keep in sync with hbase-surefire.jdk11.flags in the root pom.xml
488+
HBASE_OPTS="$HBASE_OPTS -Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true --add-modules jdk.unsupported --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-exports java.base/sun.net.dns=ALL-UNNAMED --add-exports java.base/sun.net.util=ALL-UNNAMED"
488489
}
489490

490491
#Add the development env class path stuff

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,11 @@
706706
-Xms${surefire.cygwinXms} -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
707707
"-Djava.library.path=${hadoop.library.path};${java.library.path}"
708708
-Dorg.apache.hbase.thirdparty.io.netty.leakDetection.level=advanced</hbase-surefire.cygwin-argLine>
709+
<!-- Keep these options in sync with add_jdk11_jvm_flags() in bin/hbase.
710+
Currently, all of these options are known to be required by HBase, and not the test cases -->
709711
<hbase-surefire.jdk11.flags>-Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true
710712
--add-modules jdk.unsupported
713+
--add-opens java.base/java.io=ALL-UNNAMED
711714
--add-opens java.base/java.nio=ALL-UNNAMED
712715
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
713716
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -719,6 +722,8 @@
719722
--add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED
720723
--add-exports java.base/sun.net.dns=ALL-UNNAMED
721724
--add-exports java.base/sun.net.util=ALL-UNNAMED</hbase-surefire.jdk11.flags>
725+
<!-- java.base/jdk.internal.util.random=ALL-UNNAMED is required by the test code, so we do not
726+
need this in bin/hbase -->
722727
<hbase-surefire.jdk17.flags>--add-opens java.base/jdk.internal.util.random=ALL-UNNAMED</hbase-surefire.jdk17.flags>
723728
<!-- Surefire argLine defaults to Linux, cygwin argLine is used in the os.windows profile -->
724729
<argLine>${hbase-surefire.argLine} @{jacocoArgLine}</argLine>

0 commit comments

Comments
 (0)