This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch IGNITE-22996__epic_jdk_11
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/IGNITE-22996__epic_jdk_11 by
this push:
new f551ade5bde IGNITE-23007 Move ducktape docker tests to jdk11 (#11482)
f551ade5bde is described below
commit f551ade5bdef6d469690e33be942323d3a6971e3
Author: Maksim Timonin <[email protected]>
AuthorDate: Tue Sep 3 17:24:11 2024 +0300
IGNITE-23007 Move ducktape docker tests to jdk11 (#11482)
---
deliveries/docker/apache-ignite/run.sh | 41 +++++++---------------
.../dns_failure_test/BlockingNameService.java | 20 +----------
modules/ducktests/tests/docker/Dockerfile | 2 +-
modules/ducktests/tests/docker/ducker-ignite | 2 +-
modules/ducktests/tests/docker/run_tests.sh | 4 +--
5 files changed, 17 insertions(+), 52 deletions(-)
diff --git a/deliveries/docker/apache-ignite/run.sh
b/deliveries/docker/apache-ignite/run.sh
index bacb588325c..b942f75ea0b 100755
--- a/deliveries/docker/apache-ignite/run.sh
+++ b/deliveries/docker/apache-ignite/run.sh
@@ -73,35 +73,18 @@ if [ -z "${JVM_OPTS}" ] ; then
fi
#
-# Add Java extra option
-#
-if [ "${version}" -eq 8 ] ; then
- JVM_OPTS="\
- -XX:+AggressiveOpts \
- ${JVM_OPTS}"
-elif [ "${version}" -gt 8 ] && [ "${version}" -lt 11 ]; then
- JVM_OPTS="\
- -XX:+AggressiveOpts \
- --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
- --illegal-access=permit \
- --add-modules=java.xml.bind \
- ${JVM_OPTS}"
-elif [ "${version}" -ge 11 ] ; then
- JVM_OPTS="\
- --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
- --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
- --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
- --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
- --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
- --add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
- --illegal-access=permit \
- ${JVM_OPTS}"
-fi
+# Add Java extra option
+#
+JVM_OPTS="\
+ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
+ --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
\
+ --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
+ --add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
+ --illegal-access=permit \
+ ${JVM_OPTS}"
DIGNITE_QUIET=$(printenv JVM_OPTS | grep -o 'IGNITE_QUIET=[^ ,]\+' | cut -d
"=" -f 2)
diff --git
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dns_failure_test/BlockingNameService.java
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dns_failure_test/BlockingNameService.java
index 8fd16a2297e..1b5d7a4d942 100644
---
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dns_failure_test/BlockingNameService.java
+++
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dns_failure_test/BlockingNameService.java
@@ -26,10 +26,8 @@ import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
-import java.util.List;
import java.util.Scanner;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.startup.cmdline.CommandLineStartup;
@@ -71,27 +69,11 @@ public class BlockingNameService implements
NameServiceHandler {
System.out.println("Installed DnsBlocker as main NameService to JVM");
}
- /** Installs {@code BlockingNameService} as main {@code NameService} to
JVM8. */
- private static void installJdk8() throws Exception {
- Field nameSrvcFld = InetAddress.class.getDeclaredField("nameServices");
- nameSrvcFld.setAccessible(true);
-
- nameSrvcCls = Class.forName("sun.net.spi.nameservice.NameService");
-
- BlockingNameService blkNameSrvc = new
BlockingNameService(((List)nameSrvcFld.get(InetAddress.class)).get(0));
-
- nameSrvcFld.set(InetAddress.class, F.asList(
- Proxy.newProxyInstance(InetAddress.class.getClassLoader(), new
Class<?>[] { nameSrvcCls }, blkNameSrvc)
- ));
- }
-
/** */
public static void main(String[] args) throws Exception {
String jdkVer = U.jdkVersion();
- if ("1.8".equals(jdkVer))
- installJdk8();
- else if ("11".equals(jdkVer) || "17".equals(jdkVer))
+ if ("11".equals(jdkVer) || "17".equals(jdkVer))
installJdk11();
else
throw new IllegalArgumentException("Unsupported JDK version: " +
jdkVer);
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index 0b5ae552b4b..fb0aea03f1f 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/tests/docker/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG jdk_version=openjdk:8
+ARG jdk_version=openjdk:11
FROM $jdk_version
MAINTAINER Apache Ignite [email protected]
diff --git a/modules/ducktests/tests/docker/ducker-ignite
b/modules/ducktests/tests/docker/ducker-ignite
index 4b8b589c6f6..8872f61dd19 100755
--- a/modules/ducktests/tests/docker/ducker-ignite
+++ b/modules/ducktests/tests/docker/ducker-ignite
@@ -42,7 +42,7 @@ docker_run_memory_limit="8000m"
default_num_nodes=4
# The default OpenJDK base image.
-default_jdk="openjdk:8"
+default_jdk="openjdk:11"
# The default ducker-ignite image name.
default_image_name="ducker-ignite"
diff --git a/modules/ducktests/tests/docker/run_tests.sh
b/modules/ducktests/tests/docker/run_tests.sh
index fb8d3b92f59..d06215bdaad 100755
--- a/modules/ducktests/tests/docker/run_tests.sh
+++ b/modules/ducktests/tests/docker/run_tests.sh
@@ -24,7 +24,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
IGNITE_NUM_CONTAINERS=${IGNITE_NUM_CONTAINERS:-13}
# Image name to run nodes
-JDK_VERSION="${JDK_VERSION:-8}"
+JDK_VERSION="${JDK_VERSION:-11}"
IMAGE_PREFIX="ducker-ignite-openjdk"
###
@@ -79,7 +79,7 @@ The options are as follows:
Subnet to assign nodes IP addresses, like --subnet 172.20.0.0/16
--jdk
- Set jdk version to build, default is 8
+ Set jdk version to build, default is 11
--image
Set custom docker image to run tests on.
