From efd31546bbdb994d7c6f47b77fc866b17567743c Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 31 Oct 2023 11:28:25 +0100 Subject: [PATCH] Remove no longer needed UseAESCTRIntrinsics --- core/docker/default/etc/jvm.config | 4 +--- .../src/main/resources/dist/config/jvm.config | 4 +--- docs/src/main/sphinx/installation/deployment.md | 4 +--- .../conf/environment/multinode-all/jvm.config | 2 -- .../conf/environment/multinode-ignite/jvm.config | 2 -- .../conf/environment/multinode/multinode-master-jvm.config | 2 -- .../conf/environment/multinode/multinode-worker-jvm.config | 2 -- .../docker/presto-product-tests/conf/presto/etc/jvm.config | 2 -- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/core/docker/default/etc/jvm.config b/core/docker/default/etc/jvm.config index ad09e7a867e3..a5d08bcf8ce8 100644 --- a/core/docker/default/etc/jvm.config +++ b/core/docker/default/etc/jvm.config @@ -12,8 +12,6 @@ -XX:PerBytecodeRecompilationCutoff=10000 -Djdk.attach.allowAttachSelf=true -Djdk.nio.maxCachedBufferSize=2000000 -# Improve AES performance for S3, etc. on ARM64 (JDK-8271567) --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647) +-XX:+UnlockDiagnosticVMOptions -XX:GCLockerRetryAllocationCount=32 diff --git a/core/trino-server-rpm/src/main/resources/dist/config/jvm.config b/core/trino-server-rpm/src/main/resources/dist/config/jvm.config index 7945e717e560..18dc47b3e28a 100644 --- a/core/trino-server-rpm/src/main/resources/dist/config/jvm.config +++ b/core/trino-server-rpm/src/main/resources/dist/config/jvm.config @@ -11,8 +11,6 @@ -XX:PerBytecodeRecompilationCutoff=10000 -Djdk.attach.allowAttachSelf=true -Djdk.nio.maxCachedBufferSize=2000000 -# Improve AES performance for S3, etc. on ARM64 (JDK-8271567) --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647) +-XX:+UnlockDiagnosticVMOptions -XX:GCLockerRetryAllocationCount=32 diff --git a/docs/src/main/sphinx/installation/deployment.md b/docs/src/main/sphinx/installation/deployment.md index 1053093152a9..e7f723c5ede7 100644 --- a/docs/src/main/sphinx/installation/deployment.md +++ b/docs/src/main/sphinx/installation/deployment.md @@ -138,10 +138,9 @@ The following provides a good starting point for creating `etc/jvm.config`: -XX:PerBytecodeRecompilationCutoff=10000 -Djdk.attach.allowAttachSelf=true -Djdk.nio.maxCachedBufferSize=2000000 --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics -Dfile.encoding=UTF-8 # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647) +-XX:+UnlockDiagnosticVMOptions -XX:GCLockerRetryAllocationCount=32 ``` @@ -173,7 +172,6 @@ prevents Trino from starting. You can workaround this by overriding the temporary directory by adding `-Djava.io.tmpdir=/path/to/other/tmpdir` to the list of JVM options. -We enable `-XX:+UnlockDiagnosticVMOptions` and `-XX:+UseAESCTRIntrinsics` to improve AES performance for S3, etc. on ARM64 ([JDK-8271567](https://bugs.openjdk.java.net/browse/JDK-8271567)) We set GCLocker retry allocation count (`-XX:GCLockerRetryAllocationCount=32`) to avoid OOM too early (see [JDK-8192647](https://bugs.openjdk.org/browse/JDK-8192647)) (config-properties)= diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config index 2e157dfadc1b..94148bab811b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config @@ -15,5 +15,3 @@ -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config index 2e157dfadc1b..94148bab811b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config @@ -15,5 +15,3 @@ -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config index a97e926e967f..e3fc6a6f7386 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config @@ -14,5 +14,3 @@ -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config index 70f2eeb94658..30ad30547841 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config @@ -13,5 +13,3 @@ -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config index 32cbb9ba07be..68fa29d5cecc 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config @@ -14,5 +14,3 @@ -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log --XX:+UnlockDiagnosticVMOptions --XX:+UseAESCTRIntrinsics