seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fix-4843] Rename WORKER_GROUP to WORKER_GROUPS (#4843) (#4856) 

* [Fix-4843] docker yml

* [Fix-4843] k8s env

* [Fix-#4843]  fix startup-init-conf.sh worker.properties.tpl  WORK_GROUP change WORK_GROUPS

* [Fix-#4843]  fix README.md README_zh_CN.md  WORK_GROUP change WORK_GROUPS

Co-authored-by: wangdz50 <wangdz50@chinaunicom.cn>
xingchun-chen-patch-1
wangdazhong001 2021-02-25 22:44:06 +08:00 committed by GitHub
parent a9e1d316f5
commit 73b2d5b7fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/build/README.md
View File

@ -264,7 +264,7 @@ This environment variable sets reserved memory for `worker-server`. The default
This environment variable sets port for `worker-server`. The default value is `1234`.
**`WORKER_GROUP`**
**`WORKER_GROUPS`**
This environment variable sets group for `worker-server`. The default value is `default`.

2
docker/build/README_zh_CN.md
View File

@ -263,7 +263,7 @@ Dolphin Scheduler映像使用了几个容易遗漏的环境变量。虽然这些
配置`worker-server`的端口，默认值 `1234`。
**`WORKER_GROUP`**
**`WORKER_GROUPS`**
配置`worker-server`的分组，默认值 `default`。

2
docker/build/conf/dolphinscheduler/worker.properties.tpl
View File

@ -31,7 +31,7 @@ worker.reserved.memory=${WORKER_RESERVED_MEMORY}
worker.listen.port=${WORKER_LISTEN_PORT}
# default worker group
worker.groups=${WORKER_GROUP}
worker.groups=${WORKER_GROUPS}
# default worker weight
worker.weight=${WORKER_WEIGHT}

2
docker/build/startup-init-conf.sh
View File

@ -73,7 +73,7 @@ export WORKER_HEARTBEAT_INTERVAL=${WORKER_HEARTBEAT_INTERVAL:-"10"}
export WORKER_MAX_CPULOAD_AVG=${WORKER_MAX_CPULOAD_AVG:-"100"}
export WORKER_RESERVED_MEMORY=${WORKER_RESERVED_MEMORY:-"0.1"}
export WORKER_LISTEN_PORT=${WORKER_LISTEN_PORT:-"1234"}
export WORKER_GROUP=${WORKER_GROUP:-"default"}
export WORKER_GROUPS=${WORKER_GROUPS:-"default"}
export WORKER_WEIGHT=${WORKER_WEIGHT:-"100"}
export ALERT_LISTEN_HOST=${ALERT_LISTEN_HOST:-"127.0.0.1"}

2
docker/docker-swarm/docker-compose.yml
View File

@ -160,7 +160,7 @@ services:
WORKER_HEARTBEAT_INTERVAL: "10"
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
WORKER_GROUP: "default"
WORKER_GROUPS: "default"
WORKER_WEIGHT: "100"
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
ALERT_LISTEN_HOST: dolphinscheduler-alert

2
docker/docker-swarm/docker-stack.yml
View File

@ -154,7 +154,7 @@ services:
WORKER_HEARTBEAT_INTERVAL: "10"
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
WORKER_GROUP: "default"
WORKER_GROUPS: "default"
WORKER_WEIGHT: "100"
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
ALERT_LISTEN_HOST: dolphinscheduler-alert

2
docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
View File

@ -30,6 +30,6 @@ data:
WORKER_MAX_CPULOAD_AVG: {{ .Values.worker.configmap.WORKER_MAX_CPULOAD_AVG | quote }}
WORKER_RESERVED_MEMORY: {{ .Values.worker.configmap.WORKER_RESERVED_MEMORY | quote }}
WORKER_LISTEN_PORT: {{ .Values.worker.configmap.WORKER_LISTEN_PORT | quote }}
WORKER_GROUP: {{ .Values.worker.configmap.WORKER_GROUP | quote }}
WORKER_GROUPS: {{ .Values.worker.configmap.WORKER_GROUPS | quote }}
WORKER_WEIGHT: {{ .Values.worker.configmap.WORKER_WEIGHT | quote }}
{{- end }}

4
docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
View File

@ -102,11 +102,11 @@ spec:
configMapKeyRef:
name: {{ include "dolphinscheduler.fullname" . }}-worker
key: WORKER_LISTEN_PORT
- name: WORKER_GROUP
- name: WORKER_GROUPS
valueFrom:
configMapKeyRef:
name: {{ include "dolphinscheduler.fullname" . }}-worker
key: WORKER_GROUP
key: WORKER_GROUPS
- name: WORKER_WEUGHT
valueFrom:
configMapKeyRef:

2
docker/kubernetes/dolphinscheduler/values.yaml
View File

@ -207,7 +207,7 @@ worker:
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
WORKER_LISTEN_PORT: "1234"
WORKER_GROUP: "default"
WORKER_GROUPS: "default"
WORKER_WEIGHT: "100"
## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes