[Improvement][Worker] Rename worker.weight to worker.host.weight (#4997) (#5014)

ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml

@@ -67,12 +67,12 @@
         <on-ambari-upgrade add="true"/>
     </property>
     <property>
-        <name>worker.weigth</name>
+        <name>worker.host.weigth</name>
         <value>100</value>
         <value-attributes>
             <type>int</type>
         </value-attributes>
-        <description>worker weight</description>
+        <description>worker host weight</description>
         <on-ambari-upgrade add="true"/>
     </property>
 </configuration>

docker/build/README.md

@@ -309,7 +309,7 @@ This environment variable sets port for `worker-server`. The default value is `1
 
 This environment variable sets groups for `worker-server`. The default value is `default`.
 
-**`WORKER_WEIGHT`**
+**`WORKER_HOST_WEIGHT`**
 
 This environment variable sets weight for `worker-server`. The default value is `100`.
 

docker/build/README_zh_CN.md

@@ -309,7 +309,7 @@ DolphinScheduler Docker 容器通过环境变量进行配置，缺省时将会
 
 配置`worker-server`的分组，默认值 `default`。
 
-**`WORKER_WEIGHT`**
+**`WORKER_HOST_WEIGHT`**
 
 配置`worker-server`的权重，默认之`100`。
 

docker/build/conf/dolphinscheduler/worker.properties.tpl

@@ -33,8 +33,8 @@ worker.listen.port=${WORKER_LISTEN_PORT}
 # default worker groups
 worker.groups=${WORKER_GROUPS}
 
-# default worker weight
-worker.weight=${WORKER_WEIGHT}
+# default worker host weight
+worker.host.weight=${WORKER_HOST_WEIGHT}
 
 # alert server listener host
 alert.listen.host=${ALERT_LISTEN_HOST}

docker/build/startup-init-conf.sh

@@ -84,7 +84,7 @@ 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_GROUPS=${WORKER_GROUPS:-"default"}
-export WORKER_WEIGHT=${WORKER_WEIGHT:-"100"}
+export WORKER_HOST_WEIGHT=${WORKER_HOST_WEIGHT:-"100"}
 export ALERT_LISTEN_HOST=${ALERT_LISTEN_HOST:-"127.0.0.1"}
 
 #============================================================================

docker/docker-swarm/docker-compose.yml

@@ -171,7 +171,7 @@ services:
       WORKER_MAX_CPULOAD_AVG: "100"
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUPS: "default"
-      WORKER_WEIGHT: "100"
+      WORKER_HOST_WEIGHT: "100"
       ALERT_LISTEN_HOST: dolphinscheduler-alert
       HADOOP_HOME: "/opt/soft/hadoop"
       HADOOP_CONF_DIR: "/opt/soft/hadoop/etc/hadoop"

docker/docker-swarm/docker-stack.yml

@@ -165,7 +165,7 @@ services:
       WORKER_MAX_CPULOAD_AVG: "100"
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUPS: "default"
-      WORKER_WEIGHT: "100"
+      WORKER_HOST_WEIGHT: "100"
       ALERT_LISTEN_HOST: dolphinscheduler-alert
       HADOOP_HOME: "/opt/soft/hadoop"
       HADOOP_CONF_DIR: "/opt/soft/hadoop/etc/hadoop"

docker/kubernetes/dolphinscheduler/README.md

@@ -173,7 +173,7 @@ The Configuration file is `values.yaml`, and the following tables lists the conf
 | `worker.configmap.WORKER_RESERVED_MEMORY`                                         | Only larger than reserved memory, worker server can work. default value : physical memory * 1/10, unit is G                    | `0.1`                                                 |
 | `worker.configmap.WORKER_LISTEN_PORT`                                             | Worker listen port                                                                                                             | `1234`                                                |
 | `worker.configmap.WORKER_GROUPS`                                                  | Worker groups                                                                                                                  | `default`                                             |
-| `worker.configmap.WORKER_WEIGHT`                                                  | Worker weight                                                                                                                  | `100`                                                 |
+| `worker.configmap.WORKER_HOST_WEIGHT`                                             | Worker host weight                                                                                                                  | `100`                                                 |
 | `worker.livenessProbe.enabled`                                                    | Turn on and off liveness probe                                                                                                 | `true`                                                |
 | `worker.livenessProbe.initialDelaySeconds`                                        | Delay before liveness probe is initiated                                                                                       | `30`                                                  |
 | `worker.livenessProbe.periodSeconds`                                              | How often to perform the probe                                                                                                 | `30`                                                  |

docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml

@@ -31,5 +31,5 @@ data:
   WORKER_RESERVED_MEMORY: {{ .Values.worker.configmap.WORKER_RESERVED_MEMORY | quote }}
   WORKER_LISTEN_PORT: {{ .Values.worker.configmap.WORKER_LISTEN_PORT | quote }}
   WORKER_GROUPS: {{ .Values.worker.configmap.WORKER_GROUPS | quote }}
-  WORKER_WEIGHT: {{ .Values.worker.configmap.WORKER_WEIGHT | quote }}
+  WORKER_HOST_WEIGHT: {{ .Values.worker.configmap.WORKER_HOST_WEIGHT | quote }}
 {{- end }}

docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml

@@ -111,7 +111,7 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
-                  key: WORKER_WEIGHT
+                  key: WORKER_HOST_WEIGHT
             - name: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
               valueFrom:
                 configMapKeyRef:

docker/kubernetes/dolphinscheduler/values.yaml

@@ -203,7 +203,7 @@ worker:
     WORKER_RESERVED_MEMORY: "0.1"
     WORKER_LISTEN_PORT: "1234"
     WORKER_GROUPS: "default"
-    WORKER_WEIGHT: "100"
+    WORKER_HOST_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
   livenessProbe:

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java

@@ -50,8 +50,8 @@ public class WorkerConfig {
     @Value("${worker.listen.port: 1234}")
     private int listenPort;
 
-    @Value("${worker.weight:100}")
-    private int weight;
+    @Value("${worker.host.weight:100}")
+    private int hostWeight;
 
     @Value("${alert.listen.host:localhost}")
     private String alertListenHost;
@@ -115,12 +115,12 @@ public class WorkerConfig {
         this.workerMaxCpuloadAvg = workerMaxCpuloadAvg;
     }
 
-    public int getWeight() {
-        return weight;
+    public int getHostWeight() {
+        return hostWeight;
     }
 
-    public void setWeight(int weight) {
-        this.weight = weight;
+    public void setHostWeight(int weight) {
+        this.hostWeight = weight;
     }
 
     public String getAlertListenHost() {

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java

@@ -152,7 +152,7 @@ public class WorkerRegistry {
 
         String address = getLocalAddress();
         String workerZkPathPrefix = this.zookeeperRegistryCenter.getWorkerPath();
-        int weight = workerConfig.getWeight();
+        int weight = workerConfig.getHostWeight();
         long workerStartTime = System.currentTimeMillis();
 
         for (String workGroup : this.workerGroups) {

dolphinscheduler-server/src/main/resources/worker.properties

@@ -33,8 +33,8 @@
 # default worker groups
 #worker.groups=default
 
-# default worker weight
-#worker.weight=100
+# default worker host weight
+#worker.host.weight=100
 
 # alert server listener host
 alert.listen.host=localhost