github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Improvement-13472][Api] Removes the overhead of idle Quartz Threadpool of Api (#13475) 

* [fix-13472][Api] change Threadpool of Quartz Scheduler to ZeroSizeThreadPool

* update doc about quartz threadpool configuration
3.2.0-release
xiaojingXU 2 years ago committed by GitHub
parent
8fa90c2d8f
commit
3627bf25ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      docs/docs/en/architecture/configuration.md
  2. 46
      docs/docs/zh/architecture/configuration.md
  3. 5
      dolphinscheduler-api/src/main/resources/application.yaml
  4. 35
      dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/QuartzZeroSizeThreadPool.java

48
docs/docs/en/architecture/configuration.md
Unescape View File

@ -320,23 +320,37 @@ This part describes quartz configs and configure them based on your practical si
The default configuration is as follows: The default configuration is as follows:
|Parameters | Default value| | Parameters | Default value |
|--|--| |-------------------------------------------------------------------------|-------------------------------------------------|
|spring.quartz.properties.org.quartz.threadPool.threadPriority | 5| | spring.quartz.properties.org.quartz.jobStore.isClustered | true |
|spring.quartz.properties.org.quartz.jobStore.isClustered | true| | spring.quartz.properties.org.quartz.jobStore.class | org.quartz.impl.jdbcjobstore.JobStoreTX |
|spring.quartz.properties.org.quartz.jobStore.class | org.quartz.impl.jdbcjobstore.JobStoreTX| | spring.quartz.properties.org.quartz.scheduler.instanceId | AUTO |
|spring.quartz.properties.org.quartz.scheduler.instanceId | AUTO| | spring.quartz.properties.org.quartz.jobStore.tablePrefix | QRTZ_ |
|spring.quartz.properties.org.quartz.jobStore.tablePrefix | QRTZ_| | spring.quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock | true |
|spring.quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock|true| | spring.quartz.properties.org.quartz.scheduler.instanceName | DolphinScheduler |
|spring.quartz.properties.org.quartz.scheduler.instanceName | DolphinScheduler| | spring.quartz.properties.org.quartz.jobStore.useProperties | false |
|spring.quartz.properties.org.quartz.threadPool.class | org.quartz.simpl.SimpleThreadPool| | spring.quartz.properties.org.quartz.jobStore.misfireThreshold | 60000 |
|spring.quartz.properties.org.quartz.jobStore.useProperties | false| | spring.quartz.properties.org.quartz.scheduler.makeSchedulerThreadDaemon | true |
|spring.quartz.properties.org.quartz.threadPool.makeThreadsDaemons | true| | spring.quartz.properties.org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate |
|spring.quartz.properties.org.quartz.threadPool.threadCount | 25| | spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval | 5000 |
|spring.quartz.properties.org.quartz.jobStore.misfireThreshold | 60000|
|spring.quartz.properties.org.quartz.scheduler.makeSchedulerThreadDaemon | true| The above configuration items is the same in *Master Server* and *Api Server*, but their *Quartz Scheduler* threadpool configuration is different.
|spring.quartz.properties.org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate|
|spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval | 5000| The default quartz threadpool configuration in *Master Server* is as follows:
| Parameters | Default value |
|-------------------------------------------------------------------|-----------------------------------|
| spring.quartz.properties.org.quartz.threadPool.makeThreadsDaemons | true |
| spring.quartz.properties.org.quartz.threadPool.threadCount | 25 |
| spring.quartz.properties.org.quartz.threadPool.threadPriority | 5 |
| spring.quartz.properties.org.quartz.threadPool.class | org.quartz.simpl.SimpleThreadPool |
Since *Api Server* will not start *Quartz Scheduler* instance, as a client only, therefore it's threadpool is configured as `QuartzZeroSizeThreadPool` which has zero thread;
The default configuration is as follows:
| Parameters | Default value |
|------------------------------------------------------|-----------------------------------------------------------------------|
| spring.quartz.properties.org.quartz.threadPool.class | org.apache.dolphinscheduler.scheduler.quartz.QuartzZeroSizeThreadPool |
### dolphinscheduler_env.sh [load environment variables configs] ### dolphinscheduler_env.sh [load environment variables configs]

46
docs/docs/zh/architecture/configuration.md
Unescape View File

@ -313,23 +313,35 @@ common.properties配置文件目前主要是配置hadoop/s3/yarn/applicationId
默认配置如下： 默认配置如下：
| 参数 | 默认值 | | 参数 | 默认值 |
|--|--| |-------------------------------------------------------------------------|-------------------------------------------------|
|spring.quartz.properties.org.quartz.threadPool.threadPriority | 5| | spring.quartz.properties.org.quartz.jobStore.isClustered | true |
|spring.quartz.properties.org.quartz.jobStore.isClustered | true| | spring.quartz.properties.org.quartz.jobStore.class | org.quartz.impl.jdbcjobstore.JobStoreTX |
|spring.quartz.properties.org.quartz.jobStore.class | org.quartz.impl.jdbcjobstore.JobStoreTX| | spring.quartz.properties.org.quartz.scheduler.instanceId | AUTO |
|spring.quartz.properties.org.quartz.scheduler.instanceId | AUTO| | spring.quartz.properties.org.quartz.jobStore.tablePrefix | QRTZ_ |
|spring.quartz.properties.org.quartz.jobStore.tablePrefix | QRTZ_| | spring.quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock | true |
|spring.quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock|true| | spring.quartz.properties.org.quartz.scheduler.instanceName | DolphinScheduler |
|spring.quartz.properties.org.quartz.scheduler.instanceName | DolphinScheduler| | spring.quartz.properties.org.quartz.jobStore.useProperties | false |
|spring.quartz.properties.org.quartz.threadPool.class | org.quartz.simpl.SimpleThreadPool| | spring.quartz.properties.org.quartz.jobStore.misfireThreshold | 60000 |
|spring.quartz.properties.org.quartz.jobStore.useProperties | false| | spring.quartz.properties.org.quartz.scheduler.makeSchedulerThreadDaemon | true |
|spring.quartz.properties.org.quartz.threadPool.makeThreadsDaemons | true| | spring.quartz.properties.org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate |
|spring.quartz.properties.org.quartz.threadPool.threadCount | 25| | spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval | 5000 |
|spring.quartz.properties.org.quartz.jobStore.misfireThreshold | 60000|
|spring.quartz.properties.org.quartz.scheduler.makeSchedulerThreadDaemon | true| 上述配置项在*Master Server* 和 *Api Server*是相同的，但他们的Quartz线程池配置部分却是不一样的。
|spring.quartz.properties.org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate| *Master Server* 的Quartz线程池默认配置如下：
|spring.quartz.properties.org.quartz.jobStore.clusterCheckinInterval | 5000|
| Parameters | Default value |
|-------------------------------------------------------------------|-----------------------------------|
| spring.quartz.properties.org.quartz.threadPool.makeThreadsDaemons | true |
| spring.quartz.properties.org.quartz.threadPool.threadCount | 25 |
| spring.quartz.properties.org.quartz.threadPool.threadPriority | 5 |
| spring.quartz.properties.org.quartz.threadPool.class | org.quartz.simpl.SimpleThreadPool |
因为*Api Server*不会启动*Quartz Scheduler*实例，只会作为Scheduler客户端使用，因此它的Quartz线程池将会使用`QuartzZeroSizeThreadPool`。`QuartzZeroSizeThreadPool`不会启动任何线程。具体的默认配置如下：
| Parameters | Default value |
|------------------------------------------------------|-----------------------------------------------------------------------|
| spring.quartz.properties.org.quartz.threadPool.class | org.apache.dolphinscheduler.scheduler.quartz.QuartzZeroSizeThreadPool |
## dolphinscheduler_env.sh [环境变量配置] ## dolphinscheduler_env.sh [环境变量配置]

5
dolphinscheduler-api/src/main/resources/application.yaml
Unescape View File

@ -61,17 +61,14 @@ spring:
jdbc: jdbc:
initialize-schema: never initialize-schema: never
properties: properties:
org.quartz.threadPool.threadPriority: 5
org.quartz.jobStore.isClustered: true org.quartz.jobStore.isClustered: true
org.quartz.jobStore.class: org.springframework.scheduling.quartz.LocalDataSourceJobStore org.quartz.jobStore.class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
org.quartz.scheduler.instanceId: AUTO org.quartz.scheduler.instanceId: AUTO
org.quartz.jobStore.tablePrefix: QRTZ_ org.quartz.jobStore.tablePrefix: QRTZ_
org.quartz.jobStore.acquireTriggersWithinLock: true org.quartz.jobStore.acquireTriggersWithinLock: true
org.quartz.scheduler.instanceName: DolphinScheduler org.quartz.scheduler.instanceName: DolphinScheduler
org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool org.quartz.threadPool.class: org.apache.dolphinscheduler.scheduler.quartz.QuartzZeroSizeThreadPool
org.quartz.jobStore.useProperties: false org.quartz.jobStore.useProperties: false
org.quartz.threadPool.makeThreadsDaemons: true
org.quartz.threadPool.threadCount: 25
org.quartz.jobStore.misfireThreshold: 60000 org.quartz.jobStore.misfireThreshold: 60000
org.quartz.scheduler.makeSchedulerThreadDaemon: true org.quartz.scheduler.makeSchedulerThreadDaemon: true
org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate

35
dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/QuartzZeroSizeThreadPool.java
Unescape View File

@ -0,0 +1,35 @@
/*
* 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 org.quartz.simpl.ZeroSizeThreadPool;
public class QuartzZeroSizeThreadPool extends ZeroSizeThreadPool {
/**
* fix spring bug : add getter、setter method for threadCount field
* @param count never use
*/
public void setThreadCount(int count) {
// do nothing
}
public int getThreadCount() {
return -1;
}
}
Write Preview
Loading…
Cancel
Save