Support config a seperate datasource for quartz

Author: ruanwenjun

dolphinscheduler-master/src/main/resources/application.yaml

@@ -30,6 +30,12 @@ spring:
     hikari:
       connection-test-query: select 1
       pool-name: DolphinScheduler
+  quartz-datasource:
+    # By default, do not use a separate datasource for quartz
+    # If you want to use a separate datasource, set it to true and configure the datasource below
+    # If set true and you do not configure hikari below, it will use the same configuration as spring.datasource.hikari
+    using-separate-datasource: false
+    # hikari:
   quartz:
     job-store-type: jdbc
     jdbc:
@@ -156,3 +162,5 @@ spring:
   quartz:
     properties:
       org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+  quartz-datasource:
+    using-separate-datasource: true

dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/QuartzDataSourceConfig.java

@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.scheduler.quartz;
+
+import javax.sql.DataSource;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+@Slf4j
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "spring.quartz-datasource")
+public class QuartzDataSourceConfig implements Validator {
+
+    private boolean usingSeparateDatasource = false;
+
+    private HikariConfig hikari;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return QuartzDataSourceConfig.class.isAssignableFrom(clazz);
+    }
+
+    @Override
+    public void validate(Object target, Errors errors) {
+        QuartzDataSourceConfig quartzDataSourceConfig = (QuartzDataSourceConfig) target;
+        if (!quartzDataSourceConfig.isUsingSeparateDatasource()) {
+            log.info("Will use the application datasource for quartz");
+            return;
+        }
+        if (quartzDataSourceConfig.getHikari() == null) {
+            log.info(
+                    "The spring.quartz-datasource.hikari is null, will use the application datasource's hikari config for quartz");
+            hikari = getDefaultQuartzHikariConfig();
+        } else {
+            log.info("Will use the datasource: {} for quartz", hikari.getPoolName());
+        }
+    }
+
+    private HikariConfig getDefaultQuartzHikariConfig() {
+        HikariConfig defaultQuartzHikariConfig = new HikariConfig();
+        HikariConfig applicationHikariConfig = (HikariDataSource) dataSource;
+        applicationHikariConfig.copyStateTo(defaultQuartzHikariConfig);
+
+        defaultQuartzHikariConfig.setPoolName("QuartzHikariCP");
+        return defaultQuartzHikariConfig;
+    }
+
+}

dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/QuartzSchedulerDataSourceAutoConfiguration.java

@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.scheduler.quartz;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.quartz.Scheduler;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.quartz.SchedulerFactoryBeanCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import com.zaxxer.hikari.HikariDataSource;
+
+@Slf4j
+@AutoConfiguration(after = {DataSourceAutoConfiguration.class}, before = QuartzSchedulerAutoConfiguration.class)
+@ConditionalOnClass(value = Scheduler.class)
+@ConditionalOnProperty(prefix = "spring.quartz-datasource", name = "using-separate-datasource", havingValue = "true")
+public class QuartzSchedulerDataSourceAutoConfiguration {
+
+    @Bean
+    @Order(1)
+    public SchedulerFactoryBeanCustomizer schedulerFactoryBeanCustomizer(QuartzDataSourceConfig quartzDataSourceConfig) {
+        return schedulerFactoryBean -> {
+            final HikariDataSource quartzDataSource = new HikariDataSource(quartzDataSourceConfig.getHikari());
+            schedulerFactoryBean.setDataSource(quartzDataSource);
+            schedulerFactoryBean.setTransactionManager(new DataSourceTransactionManager(quartzDataSource));
+        };
+    }
+
+}

dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/resources/META-INF/spring.factories

@@ -16,4 +16,5 @@
 #
 
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  org.apache.dolphinscheduler.scheduler.quartz.QuartzSchedulerDataSourceAutoConfiguration,\
   org.apache.dolphinscheduler.scheduler.quartz.QuartzSchedulerAutoConfiguration

dolphinscheduler-standalone-server/src/main/resources/application.yaml

@@ -32,6 +32,11 @@ spring:
       url: jdbc:h2:mem:dolphinscheduler;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
       username: sa
       password: ""
+      hikari:
+        connection-test-query: select 1
+        pool-name: DolphinSchedulerDataSource
+  quartz-datasource:
+    using-separate-datasource: false
   quartz:
     job-store-type: jdbc
     jdbc:
@@ -161,7 +166,7 @@ master:
   # master heartbeat interval
   max-heartbeat-interval: 10s
   server-load-protection:
-    enabled: true
+    enabled: false
     # Master max system cpu usage, when the master's system cpu usage is smaller then this value, master server can execute workflow.
     max-system-cpu-usage-percentage-thresholds: 0.8
     # Master max jvm cpu usage, when the master's jvm cpu usage is smaller then this value, master server can execute workflow.
@@ -197,7 +202,7 @@ worker:
   # worker group name. If it is not set, the default value is default.
   group: default
   server-load-protection:
-    enabled: true
+    enabled: false
     # Worker max system cpu usage, when the worker's system cpu usage is smaller then this value, worker server can be dispatched tasks.
     max-system-cpu-usage-percentage-thresholds: 0.8
     # Worker max jvm cpu usage, when the worker's jvm cpu usage is smaller then this value, worker server can be dispatched tasks.
@@ -321,6 +326,8 @@ spring:
        schema-locations: classpath:sql/dolphinscheduler_mysql.sql
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler-dev?useUnicode=true&characterEncoding=UTF-8
     username: root
-    password: root@123
+    password: root
+  quartz-datasource:
+    using-separate-datasource: true