This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new 617d10a [1.3.6-prepare][Fix-4843] Rename WORKER_GROUP to
WORKER_GROUPS #4856 (#4918)
617d10a is described below
commit 617d10aef47381f9ceed35b594972b67fa188f50
Author: Kirs <[email protected]>
AuthorDate: Tue Mar 9 16:52:12 2021 +0800
[1.3.6-prepare][Fix-4843] Rename WORKER_GROUP to WORKER_GROUPS #4856 (#4918)
---
docker/build/README.md | 2 +-
docker/build/README_zh_CN.md | 2 +-
docker/build/conf/dolphinscheduler/worker.properties.tpl | 2 +-
docker/build/startup-init-conf.sh | 2 +-
docker/docker-swarm/docker-compose.yml | 2 +-
docker/docker-swarm/docker-stack.yml | 2 +-
.../dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml | 2 +-
.../templates/statefulset-dolphinscheduler-worker.yaml | 4 ++--
docker/kubernetes/dolphinscheduler/values.yaml | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docker/build/README.md b/docker/build/README.md
index 6d83e89..23acef1 100644
--- a/docker/build/README.md
+++ b/docker/build/README.md
@@ -259,7 +259,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 68b33cb..facbae7 100644
--- a/docker/build/README_zh_CN.md
+++ b/docker/build/README_zh_CN.md
@@ -258,7 +258,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 81cf8f9..afdee50 100644
--- a/docker/build/conf/dolphinscheduler/worker.properties.tpl
+++ b/docker/build/conf/dolphinscheduler/worker.properties.tpl
@@ -31,4 +31,4 @@ worker.reserved.memory=${WORKER_RESERVED_MEMORY}
worker.listen.port=${WORKER_LISTEN_PORT}
# default worker group,if this worker belongs different groups,you can config
the following like that 'worker.groups=default,test'
-worker.group=${WORKER_GROUP}
+worker.groups=${WORKER_GROUPS}
diff --git a/docker/build/startup-init-conf.sh
b/docker/build/startup-init-conf.sh
index 27c73da..43c8b0a 100755
--- a/docker/build/startup-init-conf.sh
+++ b/docker/build/startup-init-conf.sh
@@ -71,7 +71,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"}
#============================================================================
# Alert Server
diff --git a/docker/docker-swarm/docker-compose.yml
b/docker/docker-swarm/docker-compose.yml
index 201e0f3..d8d29be 100644
--- a/docker/docker-swarm/docker-compose.yml
+++ b/docker/docker-swarm/docker-compose.yml
@@ -171,7 +171,7 @@ services:
WORKER_HEARTBEAT_INTERVAL: "10"
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
- WORKER_GROUP: "default"
+ WORKER_GROUPS: "default"
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
XLS_FILE_PATH: "/tmp/xls"
MAIL_SERVER_HOST: ""
diff --git a/docker/docker-swarm/docker-stack.yml
b/docker/docker-swarm/docker-stack.yml
index d68b6b9..0cf6157 100644
--- a/docker/docker-swarm/docker-stack.yml
+++ b/docker/docker-swarm/docker-stack.yml
@@ -165,7 +165,7 @@ services:
WORKER_HEARTBEAT_INTERVAL: "10"
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
- WORKER_GROUP: "default"
+ WORKER_GROUPS: "default"
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
XLS_FILE_PATH: "/tmp/xls"
MAIL_SERVER_HOST: ""
diff --git
a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
index 2aa1eab..155c529 100644
---
a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
+++
b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
@@ -29,7 +29,7 @@ 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 }}
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: {{ include
"dolphinscheduler.worker.base.dir" . | quote }}
dolphinscheduler_env.sh: |-
{{- range .Values.worker.configmap.DOLPHINSCHEDULER_ENV }}
diff --git
a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
index fe83bd5..b28314b 100644
---
a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++
b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -89,11 +89,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: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
valueFrom:
configMapKeyRef:
diff --git a/docker/kubernetes/dolphinscheduler/values.yaml
b/docker/kubernetes/dolphinscheduler/values.yaml
index d154c87..3bc61c6 100644
--- a/docker/kubernetes/dolphinscheduler/values.yaml
+++ b/docker/kubernetes/dolphinscheduler/values.yaml
@@ -158,7 +158,7 @@ worker:
WORKER_MAX_CPULOAD_AVG: "100"
WORKER_RESERVED_MEMORY: "0.1"
WORKER_LISTEN_PORT: "1234"
- WORKER_GROUP: "default"
+ WORKER_GROUPS: "default"
DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler"
DOLPHINSCHEDULER_ENV:
- "export HADOOP_HOME=/opt/soft/hadoop"
