From 43c6300d1b226c6d0e0952311cff019ecc986d7a Mon Sep 17 00:00:00 2001 From: tledkov-gridgain Date: Tue, 25 Sep 2018 19:07:23 +0300 Subject: [PATCH 1/2] IGNITE-9686: JDK9: pass jdk9 specific JVM options to new process when start Ignite test node in separate JVM --- .../junits/multijvm/IgniteProcessProxy.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 1eb7ddb09deb8..e9dc80d374d35 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -266,6 +266,22 @@ protected Collection filteredJvmArgs() throws Exception { filteredJvmArgs.add(arg); } + filteredJvmArgs.add("-XX:+IgnoreUnrecognizedVMOptions"); + filteredJvmArgs.add("--add-opens"); + filteredJvmArgs.add("java.base/jdk.internal.loader=ALL-UNNAMED"); + filteredJvmArgs.add("--add-exports"); + filteredJvmArgs.add("java.base/jdk.internal.misc=ALL-UNNAMED"); + filteredJvmArgs.add("--add-exports"); + filteredJvmArgs.add("java.base/sun.nio.ch=ALL-UNNAMED"); + filteredJvmArgs.add("--add-exports"); + filteredJvmArgs.add("java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"); + filteredJvmArgs.add("--add-exports"); + filteredJvmArgs.add("jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"); + filteredJvmArgs.add("--add-exports"); + filteredJvmArgs.add("java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"); + filteredJvmArgs.add("--add-modules"); + filteredJvmArgs.add("java.xml.bind"); + return filteredJvmArgs; } From 9d425655a62bda162bc0ca4ff0e203a3d800d8cd Mon Sep 17 00:00:00 2001 From: tledkov-gridgain Date: Wed, 26 Sep 2018 14:45:22 +0300 Subject: [PATCH 2/2] IGNITE-9686: fix for jdk8 --- .../junits/multijvm/IgniteProcessProxy.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index e9dc80d374d35..c1454bcc6f687 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -262,26 +262,12 @@ protected Collection filteredJvmArgs() throws Exception { for (String arg : U.jvmArgs()) { if (arg.startsWith("-Xmx") || arg.startsWith("-Xms") || arg.startsWith("-cp") || arg.startsWith("-classpath") || - (marsh != null && arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME))) + (marsh != null && arg.startsWith("-D" + IgniteTestResources.MARSH_CLASS_NAME)) || + arg.startsWith("--add-opens") || arg.startsWith("--add-exports") || arg.startsWith("--add-modules") || + arg.startsWith("--patch-module") || arg.startsWith("--add-reads")) filteredJvmArgs.add(arg); } - filteredJvmArgs.add("-XX:+IgnoreUnrecognizedVMOptions"); - filteredJvmArgs.add("--add-opens"); - filteredJvmArgs.add("java.base/jdk.internal.loader=ALL-UNNAMED"); - filteredJvmArgs.add("--add-exports"); - filteredJvmArgs.add("java.base/jdk.internal.misc=ALL-UNNAMED"); - filteredJvmArgs.add("--add-exports"); - filteredJvmArgs.add("java.base/sun.nio.ch=ALL-UNNAMED"); - filteredJvmArgs.add("--add-exports"); - filteredJvmArgs.add("java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"); - filteredJvmArgs.add("--add-exports"); - filteredJvmArgs.add("jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"); - filteredJvmArgs.add("--add-exports"); - filteredJvmArgs.add("java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"); - filteredJvmArgs.add("--add-modules"); - filteredJvmArgs.add("java.xml.bind"); - return filteredJvmArgs; }