diff --git a/docker/build/README.md b/docker/build/README.md index 8041211e83..7f6983b00c 100644 --- a/docker/build/README.md +++ b/docker/build/README.md @@ -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`. diff --git a/docker/build/README_zh_CN.md b/docker/build/README_zh_CN.md index 665b3b77f4..d8d29efe28 100644 --- a/docker/build/README_zh_CN.md +++ b/docker/build/README_zh_CN.md @@ -263,7 +263,7 @@ Dolphin Scheduler映像使用了几个容易遗漏的环境变量。虽然这些 配置`worker-server`的端口,默认值 `1234`。 -**`WORKER_GROUP`** +**`WORKER_GROUPS`** 配置`worker-server`的分组,默认值 `default`。 diff --git a/docker/build/conf/dolphinscheduler/worker.properties.tpl b/docker/build/conf/dolphinscheduler/worker.properties.tpl index 2093da3501..d3ef35a813 100644 --- a/docker/build/conf/dolphinscheduler/worker.properties.tpl +++ b/docker/build/conf/dolphinscheduler/worker.properties.tpl @@ -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} diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh index 9439048587..52004d7e6c 100755 --- a/docker/build/startup-init-conf.sh +++ b/docker/build/startup-init-conf.sh @@ -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"} diff --git a/docker/docker-swarm/docker-compose.yml b/docker/docker-swarm/docker-compose.yml index 2360c4abed..9c45e5b5df 100644 --- a/docker/docker-swarm/docker-compose.yml +++ b/docker/docker-swarm/docker-compose.yml @@ -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 diff --git a/docker/docker-swarm/docker-stack.yml b/docker/docker-swarm/docker-stack.yml index 7035ac3bda..da5b8cba16 100644 --- a/docker/docker-swarm/docker-stack.yml +++ b/docker/docker-swarm/docker-stack.yml @@ -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 diff --git a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml index 78b6ed1036..2b6a36615c 100644 --- a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml @@ -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 }} \ No newline at end of file diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml index 76527b79e2..7ca548c763 100644 --- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml @@ -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: diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index b99b553b4b..99979af9d4 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -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