From 3a2cba7a14b1dcf8325dab6fb1bfaa5840eae0fd Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Mon, 13 Jul 2020 17:13:52 +0800 Subject: [PATCH] Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' --- .../1.2.1/package/templates/dolphin-daemon.j2 | 3 ++- .../1.3.0/package/templates/dolphin-daemon.sh.j2 | 3 ++- .../dolphinscheduler/api/ApiApplicationServer.java | 1 + .../src/main/resources/datasource.properties | 13 +++++++++---- dolphinscheduler-ui/.env | 4 ++-- script/dolphinscheduler-daemon.sh | 3 ++- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/dolphin-daemon.j2 b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/dolphin-daemon.j2 index ab99ffda47..793cdd5157 100644 --- a/ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/dolphin-daemon.j2 +++ b/ambari_plugin/common-services/DOLPHIN/1.2.1/package/templates/dolphin-daemon.j2 @@ -39,7 +39,8 @@ export HOSTNAME=`hostname` DOLPHINSCHEDULER_LIB_JARS={{dolphin_lib_jars}} -DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms4g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" +DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms4g -Xss512k -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled +-XX:LargePageSizeInBytes=10m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" STOP_TIMEOUT=5 log={{dolphin_log_dir}}/dolphinscheduler-$command-$HOSTNAME.out diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/dolphin-daemon.sh.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/dolphin-daemon.sh.j2 index 0802b74750..263638a584 100644 --- a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/dolphin-daemon.sh.j2 +++ b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/dolphin-daemon.sh.j2 @@ -39,7 +39,8 @@ export HOSTNAME=`hostname` DOLPHINSCHEDULER_LIB_JARS={{dolphin_lib_jars}} -DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms4g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" +DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms4g -Xss512k -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled +-XX:LargePageSizeInBytes=10m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" STOP_TIMEOUT=5 log={{dolphin_log_dir}}/dolphinscheduler-$command-$HOSTNAME.out diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java index e4817ddc18..f6476041f6 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java @@ -33,6 +33,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; public class ApiApplicationServer extends SpringBootServletInitializer { public static void main(String[] args) { + System.setProperty("spring.profiles.active","api"); SpringApplication.run(ApiApplicationServer.class, args); } diff --git a/dolphinscheduler-dao/src/main/resources/datasource.properties b/dolphinscheduler-dao/src/main/resources/datasource.properties index 25ac220312..23712c4849 100644 --- a/dolphinscheduler-dao/src/main/resources/datasource.properties +++ b/dolphinscheduler-dao/src/main/resources/datasource.properties @@ -16,10 +16,15 @@ # # postgresql -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler -spring.datasource.username=test -spring.datasource.password=test +#spring.datasource.driver-class-name=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler +#spring.datasource.username=test +#spring.datasource.password=test + +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 +spring.datasource.username=root +spring.datasource.password=root # connection configuration #spring.datasource.initialSize=5 diff --git a/dolphinscheduler-ui/.env b/dolphinscheduler-ui/.env index e676be6059..163dfae58c 100644 --- a/dolphinscheduler-ui/.env +++ b/dolphinscheduler-ui/.env @@ -14,7 +14,7 @@ # limitations under the License. # back end interface address -API_BASE = http://192.168.xx.xx:12345 +API_BASE = http://127.0.0.1:12345 # If IP access is required for local development, remove the "#" -#DEV_HOST = 192.168.xx.xx +DEV_HOST = 127.0.0.1 diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh index b0437a30c2..b430bb4596 100644 --- a/script/dolphinscheduler-daemon.sh +++ b/script/dolphinscheduler-daemon.sh @@ -46,7 +46,8 @@ export DOLPHINSCHEDULER_LOG_DIR=$DOLPHINSCHEDULER_HOME/logs export DOLPHINSCHEDULER_CONF_DIR=$DOLPHINSCHEDULER_HOME/conf export DOLPHINSCHEDULER_LIB_JARS=$DOLPHINSCHEDULER_HOME/lib/* -export DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" +export DOLPHINSCHEDULER_OPTS="-server -Xmx16g -Xms1g -Xss512k -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled +-XX:LargePageSizeInBytes=10m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70" export STOP_TIMEOUT=5 if [ ! -d "$DOLPHINSCHEDULER_LOG_DIR" ]; then