Skip to content

Commit bdbb330

Browse files
SbloodySSbloodyS
authored
Merge branch 'dev' into dev
2 parents cbbe09d + cf400b8 commit bdbb330

10 files changed

+73
-32
lines changed

‎deploy/kubernetes/dolphinscheduler/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
158158
| conf.common."yarn.application.status.address" | string | `"http://ds1:%s/ws/v1/cluster/apps/%s"` | if resourcemanager HA is enabled or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ds1 to actual resourcemanager hostname |
159159
| conf.common."yarn.job.history.status.address" | string | `"http://ds1:19888/ws/v1/history/mapreduce/jobs/%s"` | job history status url when application number threshold is reached(default 10000, maybe it was set to 1000) |
160160
| conf.common."yarn.resourcemanager.ha.rm.ids" | string | `"192.168.xx.xx,192.168.xx.xx"` | if resourcemanager HA is enabled, please set the HA IPs; if resourcemanager is single, keep this value empty |
161+
| datasource.profile | string | `"postgresql"` | The profile of datasource |
161162
| externalDatabase.database | string | `"dolphinscheduler"` | The database of external database |
162163
| externalDatabase.driverClassName | string | `"org.postgresql.Driver"` | The driverClassName of external database |
163164
| externalDatabase.enabled | bool | `false` | If exists external database, and set postgresql.enable value to false. external database will be used, otherwise Dolphinscheduler's internal database will be used. |

‎deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ data:
3333
banner:
3434
charset: UTF-8
3535
datasource:
36-
profile: postgresql
37-
config:
38-
driver-class-name: org.postgresql.Driver
39-
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
40-
username: root
41-
password: root
42-
hikari:
43-
connection-test-query: select 1
44-
pool-name: DolphinScheduler
36+
driver-class-name: org.postgresql.Driver
37+
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
38+
username: root
39+
password: root
40+
hikari:
41+
connection-test-query: select 1
42+
pool-name: DolphinScheduler
4543
4644
# Mybatis-plus configuration, you don't need to change it
4745
mybatis-plus:
@@ -102,4 +100,16 @@ data:
102100
103101
metrics:
104102
enabled: true
103+
104+
# Override by profile
105+
---
106+
spring:
107+
config:
108+
activate:
109+
on-profile: mysql
110+
datasource:
111+
driver-class-name: com.mysql.cj.jdbc.Driver
112+
url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
113+
username: root
114+
password: root
105115
{{- end }}

‎deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,13 @@ data:
5454
messages:
5555
basename: i18n/messages
5656
datasource:
57-
profile: postgresql
58-
config:
59-
driver-class-name: org.postgresql.Driver
60-
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
61-
username: root
62-
password: root
63-
hikari:
64-
connection-test-query: select 1
65-
pool-name: DolphinScheduler
57+
driver-class-name: org.postgresql.Driver
58+
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
59+
username: root
60+
password: root
61+
hikari:
62+
connection-test-query: select 1
63+
pool-name: DolphinScheduler
6664
quartz:
6765
auto-startup: false
6866
job-store-type: jdbc
@@ -239,6 +237,21 @@ data:
239237
application-name: ""
240238
# Doplhinscheduler login url
241239
redirect-url: ""
240+
241+
# Override by profile
242+
---
243+
spring:
244+
config:
245+
activate:
246+
on-profile: mysql
247+
datasource:
248+
driver-class-name: com.mysql.cj.jdbc.Driver
249+
url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
250+
username: root
251+
password: root
252+
quartz:
253+
properties:
254+
org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
242255
{{- end }}
243256

244257

‎deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ data:
3333
time-zone: UTC
3434
date-format: "yyyy-MM-dd HH:mm:ss"
3535
datasource:
36-
profile: postgresql
37-
config:
38-
driver-class-name: org.postgresql.Driver
39-
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
40-
username: root
41-
password: root
42-
hikari:
43-
connection-test-query: select 1
44-
pool-name: DolphinScheduler
36+
driver-class-name: org.postgresql.Driver
37+
url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
38+
username: root
39+
password: root
40+
hikari:
41+
connection-test-query: select 1
42+
pool-name: DolphinScheduler
4543
quartz:
4644
job-store-type: jdbc
4745
jdbc:
@@ -157,4 +155,19 @@ data:
157155
158156
metrics:
159157
enabled: true
158+
159+
# Override by profile
160+
---
161+
spring:
162+
config:
163+
activate:
164+
on-profile: mysql
165+
datasource:
166+
driver-class-name: com.mysql.cj.jdbc.Driver
167+
url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
168+
username: root
169+
password: root
170+
quartz:
171+
properties:
172+
org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
160173
{{- end }}

‎deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ spec:
131131
name: {{ include "dolphinscheduler.fullname" . }}-configs
132132
- name: alert-config-volume
133133
configMap:
134-
name: { { include "dolphinscheduler.fullname" . } }-alert
134+
name: {{ include "dolphinscheduler.fullname" . }}-alert
135135
{{- end }}

‎deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ spec:
141141
name: {{ include "dolphinscheduler.fullname" . }}-configs
142142
- name: api-config-volume
143143
configMap:
144-
name: { { include "dolphinscheduler.fullname" . } }-api
144+
name: {{ include "dolphinscheduler.fullname" . }}-api
145145
{{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
146146
{{- include "dolphinscheduler.fsFileResource.volume" . | nindent 8 }}
147147
{{- include "dolphinscheduler.ldap.ssl.volume" . | nindent 8 }}

‎deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ spec:
127127
{{- end }}
128128
- name: master-config-volume
129129
configMap:
130-
name: { { include "dolphinscheduler.fullname" . } }-master
130+
name: {{ include "dolphinscheduler.fullname" . }}-master
131131
{{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
132132
- name: config-volume
133133
configMap:

‎deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ spec:
144144
{{- end }}
145145
- name: worker-config-volume
146146
configMap:
147-
name: { { include "dolphinscheduler.fullname" . } }-worker
147+
name: {{ include "dolphinscheduler.fullname" . }}-worker
148148
- name: config-volume
149149
configMap:
150150
name: {{ include "dolphinscheduler.fullname" . }}-configs

‎deploy/kubernetes/dolphinscheduler/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ image:
4949
# -- tools image
5050
tools: dolphinscheduler-tools
5151

52+
datasource:
53+
# -- The profile of datasource
54+
profile: postgresql
55+
5256
postgresql:
5357
# -- If not exists external PostgreSQL, by default, the DolphinScheduler will use a internal PostgreSQL
5458
enabled: true

‎docs/docs/zh/guide/task/appendix.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|----------|--------------------------------------------------------------------------------------------------------------------------------------|
99
| 任务名称 | 任务的名称，同一个工作流定义中的节点名称不能重复。 |
1010
| 运行标志 | 标识这个节点是否需要调度执行，如果不需要执行，可以打开禁止执行开关。 |
11-
| 缓存执行 | 标识这个节点是否需要进行缓存，如果缓存，则对于相同标识（相同任务版本，相同任务定义，相同参数传入）的任务进行缓存，运行时若已经存在缓存过的任务时，不在重复执行，直接复用结果。 |
11+
| 缓存执行 | 标识这个节点是否需要进行缓存，如果缓存，则对于相同标识（相同任务版本，相同任务定义，相同参数传入）的任务进行缓存，运行时若已经存在缓存过的任务时，不再重复执行，直接复用结果。 |
1212
| 描述 | 当前节点的功能描述。 |
1313
| 任务优先级 | worker线程数不足时，根据优先级从高到低依次执行任务，优先级一样时根据先到先得原则执行。 |
1414
| Worker分组 | 设置分组后，任务会被分配给worker组的机器机执行。若选择Default，则会随机选择一个worker执行。 |

0 commit comments

Comments
 (0)