From 3893f069f42dd7b1d4fc085d6f2ff4d8235c5301 Mon Sep 17 00:00:00 2001 From: Anant Aneja Date: Mon, 21 Oct 2024 22:46:47 +0530 Subject: [PATCH] Update base image for Presto to one that uses JDK 17 --- .../conf/docker/common/standard.yml | 10 ++++++++-- .../multinode-tls-kerberos/docker-compose.yml | 4 ++-- .../docker/multinode-tls/docker-compose.yml | 4 ++-- .../conf/docker/multinode/docker-compose.yml | 2 +- .../conf/presto/etc/jvm.config | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/presto-product-tests/conf/docker/common/standard.yml b/presto-product-tests/conf/docker/common/standard.yml index 67a1993220fb9..e01220b41baae 100644 --- a/presto-product-tests/conf/docker/common/standard.yml +++ b/presto-product-tests/conf/docker/common/standard.yml @@ -6,6 +6,12 @@ services: - ../..:/docker/volumes/conf - ../../target:/docker/volumes/logs + java-17-base: + image: 'aaneja/ubi9_jdk17_python:latest' + volumes: + - ../..:/docker/volumes/conf + - ../../target:/docker/volumes/logs + hadoop-master: extends: service: java-8-base @@ -28,7 +34,7 @@ services: presto-master: extends: - service: java-8-base + service: java-17-base hostname: presto-master command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh singlenode run ports: @@ -42,7 +48,7 @@ services: application-runner: extends: - service: java-8-base + service: java-17-base hostname: application-runner command: bash -c 'echo please provide command to application-runner >&2; exit 1' volumes: diff --git a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml index 86e3f3ece9bd3..7678c52ce429e 100644 --- a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml +++ b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml @@ -20,7 +20,7 @@ services: image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}' extends: file: ../common/standard.yml - service: java-8-base + service: java-17-base command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-tls-kerberos-worker run networks: default: @@ -37,7 +37,7 @@ services: image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}' extends: file: ../common/standard.yml - service: java-8-base + service: java-17-base command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-tls-kerberos-worker run networks: default: diff --git a/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml index 310feeb09e7f4..ccd055a1b9b50 100644 --- a/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml +++ b/presto-product-tests/conf/docker/multinode-tls/docker-compose.yml @@ -16,7 +16,7 @@ services: hostname: presto-worker-1 extends: file: ../common/standard.yml - service: java-8-base + service: java-17-base command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-tls-worker run networks: default: @@ -32,7 +32,7 @@ services: hostname: presto-worker-2 extends: file: ../common/standard.yml - service: java-8-base + service: java-17-base command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-tls-worker run networks: default: diff --git a/presto-product-tests/conf/docker/multinode/docker-compose.yml b/presto-product-tests/conf/docker/multinode/docker-compose.yml index ef2b669b2242d..fa3f98bcebf90 100644 --- a/presto-product-tests/conf/docker/multinode/docker-compose.yml +++ b/presto-product-tests/conf/docker/multinode/docker-compose.yml @@ -8,7 +8,7 @@ services: presto-worker: extends: file: ../common/standard.yml - service: java-8-base + service: java-17-base command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-worker run depends_on: - presto-master diff --git a/presto-product-tests/conf/presto/etc/jvm.config b/presto-product-tests/conf/presto/etc/jvm.config index 9a1ebfe6669e2..ccdd6cf9a5ab9 100644 --- a/presto-product-tests/conf/presto/etc/jvm.config +++ b/presto-product-tests/conf/presto/etc/jvm.config @@ -15,7 +15,25 @@ -XX:ReservedCodeCacheSize=150M # jdk.nio.maxCachedBufferSize controls what buffers can be allocated in per-thread "temporary buffer cache" (sun.nio.ch.Util). Value of 0 disables the cache. -Djdk.nio.maxCachedBufferSize=0 +-Djdk.attach.allowAttachSelf=true -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu #-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -XX:ErrorFile=/docker/volumes/logs/product-tests-presto-jvm-error-file.log +# We need to figure out which ones are actually needed, using the same ones as 'air.test.jvm.additional-arguments' +--add-opens java.base/java.io=ALL-UNNAMED +--add-opens java.base/java.lang=ALL-UNNAMED +--add-opens java.base/java.lang.ref=ALL-UNNAMED +--add-opens java.base/java.lang.reflect=ALL-UNNAMED +--add-opens java.base/java.net=ALL-UNNAMED +--add-opens java.base/java.nio=ALL-UNNAMED +--add-opens java.base/java.security=ALL-UNNAMED +--add-opens java.base/javax.security.auth=ALL-UNNAMED +--add-opens java.base/javax.security.auth.login=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.concurrent.atomic=ALL-UNNAMED +--add-opens java.base/java.util.regex=ALL-UNNAMED +--add-opens java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens java.base/sun.security.action=ALL-UNNAMED