From 04fbf6e196e227b7cc47ab3d26d677d003657694 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Fri, 22 Dec 2023 18:12:28 -0300 Subject: [PATCH] Fix GC algorithm and set images to Java 17 Signed-off-by: Ricardo Zanini --- kogito-base-builder-image.yaml | 2 +- kogito-data-index-ephemeral-image.yaml | 2 +- kogito-data-index-infinispan-image.yaml | 2 +- kogito-data-index-mongodb-image.yaml | 2 +- kogito-data-index-oracle-image.yaml | 2 +- kogito-data-index-postgresql-image.yaml | 2 +- kogito-explainability-image.yaml | 2 +- kogito-jit-runner-image.yaml | 2 +- kogito-jobs-service-allinone-image.yaml | 2 +- kogito-jobs-service-ephemeral-image.yaml | 2 +- kogito-jobs-service-infinispan-image.yaml | 2 +- kogito-jobs-service-mongodb-image.yaml | 2 +- kogito-jobs-service-postgresql-image.yaml | 2 +- kogito-management-console-image.yaml | 2 +- kogito-runtime-jvm-image.yaml | 2 +- kogito-swf-builder-image.yaml | 4 ++-- kogito-swf-devmode-image.yaml | 4 ++-- kogito-task-console-image.yaml | 2 +- kogito-trusty-infinispan-image.yaml | 2 +- kogito-trusty-postgresql-image.yaml | 2 +- kogito-trusty-redis-image.yaml | 2 +- kogito-trusty-ui-image.yaml | 2 +- modules/kogito-dynamic-resources/added/java-default-options | 2 +- modules/kogito-dynamic-resources/module.yaml | 2 +- .../scripts/tests/bats/kogito-swf-builder-jvm-settings.bats | 4 ++-- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml index 8debb7c0e..de5cb8846 100644 --- a/kogito-base-builder-image.yaml +++ b/kogito-base-builder-image.yaml @@ -37,7 +37,7 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven version: "3.9.3" diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml index 44139bd52..7b831f1b6 100644 --- a/kogito-data-index-ephemeral-image.yaml +++ b/kogito-data-index-ephemeral-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.community.ephemeral diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml index d4f791fe4..723cc63bc 100644 --- a/kogito-data-index-infinispan-image.yaml +++ b/kogito-data-index-infinispan-image.yaml @@ -53,7 +53,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.infinispan diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml index d56e0e0ca..dfbb5c1c7 100644 --- a/kogito-data-index-mongodb-image.yaml +++ b/kogito-data-index-mongodb-image.yaml @@ -35,7 +35,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.mongodb diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml index 24c693d12..78fbf0227 100644 --- a/kogito-data-index-oracle-image.yaml +++ b/kogito-data-index-oracle-image.yaml @@ -35,7 +35,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.oracle diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml index 09eb182c4..b6f530a8b 100644 --- a/kogito-data-index-postgresql-image.yaml +++ b/kogito-data-index-postgresql-image.yaml @@ -39,7 +39,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.postgresql diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml index 11ec11e02..33cf268b1 100644 --- a/kogito-explainability-image.yaml +++ b/kogito-explainability-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.explainability diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml index af952a5dd..4cc1ef0c9 100644 --- a/kogito-jit-runner-image.yaml +++ b/kogito-jit-runner-image.yaml @@ -35,7 +35,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jit-runner diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml index c2ebb88e7..6e0f1b8d1 100644 --- a/kogito-jobs-service-allinone-image.yaml +++ b/kogito-jobs-service-allinone-image.yaml @@ -41,7 +41,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.allinone diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml index 4b4d1dd8a..b666fdec5 100644 --- a/kogito-jobs-service-ephemeral-image.yaml +++ b/kogito-jobs-service-ephemeral-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.ephemeral diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml index af9db94b5..b1a818e9f 100644 --- a/kogito-jobs-service-infinispan-image.yaml +++ b/kogito-jobs-service-infinispan-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.infinispan diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml index 811da4145..f4db8c4ce 100644 --- a/kogito-jobs-service-mongodb-image.yaml +++ b/kogito-jobs-service-mongodb-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.mongodb diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml index 0dc583503..c53b5427d 100644 --- a/kogito-jobs-service-postgresql-image.yaml +++ b/kogito-jobs-service-postgresql-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.postgresql diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml index 4001fec34..1f0eba296 100644 --- a/kogito-management-console-image.yaml +++ b/kogito-management-console-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.management.console diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml index 5d8ec25b6..e2fd82c70 100644 --- a/kogito-runtime-jvm-image.yaml +++ b/kogito-runtime-jvm-image.yaml @@ -50,7 +50,7 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.project.versions - name: org.kie.kogito.s2i.core diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml index 47a20f806..e501efe0c 100644 --- a/kogito-swf-builder-image.yaml +++ b/kogito-swf-builder-image.yaml @@ -10,7 +10,7 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven version: "3.9.3" @@ -58,7 +58,7 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven version: "3.9.3" diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml index 1ba416096..3c5de04d0 100644 --- a/kogito-swf-devmode-image.yaml +++ b/kogito-swf-devmode-image.yaml @@ -10,7 +10,7 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven version: "3.9.3" @@ -56,7 +56,7 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven version: "3.9.3" diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml index b8902ce88..82468d3a2 100644 --- a/kogito-task-console-image.yaml +++ b/kogito-task-console-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.task.console diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml index 893d2e18f..b67c62c67 100644 --- a/kogito-trusty-infinispan-image.yaml +++ b/kogito-trusty-infinispan-image.yaml @@ -53,7 +53,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.trusty.infinispan diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml index 3fe0e90d4..84503be7c 100644 --- a/kogito-trusty-postgresql-image.yaml +++ b/kogito-trusty-postgresql-image.yaml @@ -35,7 +35,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.trusty.postgresql diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml index b9b7d25e1..ddba8af99 100644 --- a/kogito-trusty-redis-image.yaml +++ b/kogito-trusty-redis-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.trusty.redis diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml index ae57836a7..f74cac804 100644 --- a/kogito-trusty-ui-image.yaml +++ b/kogito-trusty-ui-image.yaml @@ -38,7 +38,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.trusty.ui diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options index 5b4c78aa0..620515414 100644 --- a/modules/kogito-dynamic-resources/added/java-default-options +++ b/modules/kogito-dynamic-resources/added/java-default-options @@ -139,7 +139,7 @@ gc_config() { local timeRatio=${GC_TIME_RATIO:-4} local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90} local maxMetaspaceSize - local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelOldGC}" + local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelGC}" # for compat reasons we don't set a default value for metaspaceSize local metaspaceSize diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml index ac2aa2a03..ada2e7e5e 100644 --- a/modules/kogito-dynamic-resources/module.yaml +++ b/modules/kogito-dynamic-resources/module.yaml @@ -55,5 +55,5 @@ envs: description: The maximum metaspace size. example: "100" - name: GC_CONTAINER_OPTIONS - description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`. + description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelGC`. example: -XX:+UseG1GC diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats index 3c67ff1ec..1b45a00b7 100644 --- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats +++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats @@ -22,7 +22,7 @@ teardown() { source ${KOGITO_HOME}/launch/jvm-settings.sh echo "MAVEN_OPTS is: ${MAVEN_OPTS}" - [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] + [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] } @test "run jvm-settings with custom conf" { @@ -34,5 +34,5 @@ teardown() { source ${KOGITO_HOME}/launch/jvm-settings.sh echo "MAVEN_OPTS is: ${MAVEN_OPTS}" - [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] + [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] }