From 419f18f8b8f28cea89210a6135ed48d723cb0941 Mon Sep 17 00:00:00 2001 From: zwZjut Date: Mon, 10 Jan 2022 15:53:26 +0800 Subject: [PATCH] [Feature][dolphinscheduler-dao] expose hikari parameters when deploy on k8s #7910 (#7911) * #7910 * #7910 * #7910 Co-authored-by: honghuo.zw --- .../build/conf/dolphinscheduler/datasource.properties.tpl | 3 +++ docker/build/startup-init-conf.sh | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/build/conf/dolphinscheduler/datasource.properties.tpl b/docker/build/conf/dolphinscheduler/datasource.properties.tpl index 9177732ba6..c135752e15 100644 --- a/docker/build/conf/dolphinscheduler/datasource.properties.tpl +++ b/docker/build/conf/dolphinscheduler/datasource.properties.tpl @@ -21,6 +21,9 @@ spring.datasource.url=jdbc:${DATABASE_TYPE}://${DATABASE_HOST}:${DATABASE_PORT}/ spring.datasource.username=${DATABASE_USERNAME} spring.datasource.password=${DATABASE_PASSWORD} +# hikari configuration +spring.datasource.hikari.maximum-pool-size=${HIKARI_MAXIMUM_POOL_SIZE} + # mysql example #spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh index ad61829074..ada1984885 100755 --- a/docker/build/startup-init-conf.sh +++ b/docker/build/startup-init-conf.sh @@ -38,14 +38,20 @@ echo "init env variables" [ "h2" == ${DATABASE_TYPE} ] || export SPRING_DATASOURCE_USERNAME=${DATABASE_USERNAME} [ "h2" == ${DATABASE_TYPE} ] || export SPRING_DATASOURCE_PASSWORD=${DATABASE_PASSWORD} # export SPRING_DATASOURCE_DRIVER_CLASS_NAME=${DATABASE_DRIVER} +export SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=${HIKARI_MAXIMUM_POOL_SIZE:-"50"} +#============================================================================ +# Quartz +#============================================================================ +export ORG_QUARTZ_THREADPOOL_THREADCOUNT=${ORG_QUARTZ_THREADPOOL_THREADCOUNT:-"25"} +export ORG_QUARTZ_SCHEDULER_BATCHTRIGGERACQUISTITIONMAXCOUNT=${ORG_QUARTZ_SCHEDULER_BATCHTRIGGERACQUISTITIONMAXCOUNT:-"1"} #============================================================================ # Registry #============================================================================ export REGISTRY_PLUGIN_NAME=${REGISTRY_PLUGIN_NAME:-"zookeeper"} export REGISTRY_SERVERS=${REGISTRY_SERVERS:-"127.0.0.1:2181"} - +export SESSION_TIMEOUT_MS=${SESSION_TIMEOUT_MS:-"30000"} #============================================================================ # Common #============================================================================