Update base image for Presto

to one that uses JDK 17
prestodb · Oct 22, 2024 · 3893f06 · 3893f06
1 parent e6b7f1d
commit 3893f06
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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