[incubator-dolphinscheduler] branch dev-1.3.0 updated: fix worker group config no effect (#2719)

[journey]

This is an automated email from the ASF dual-hosted git repository.

journey pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new f26d2a7  fix worker group config no effect (#2719)
f26d2a7 is described below

commit f26d2a7c20a4dcf55c5838647f6704dbca061a1d
Author: dailidong <dailidon...@gmail.com>
AuthorDate: Thu May 14 18:21:59 2020 +0800

    fix worker group config no effect (#2719)
---
 .../src/main/resources/config/install_config.conf                   | 5 +++--
 script/scp-hosts.sh                                                 | 6 +++---
 script/start-all.sh                                                 | 3 +--
 script/stop-all.sh                                                  | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/dolphinscheduler-server/src/main/resources/config/install_config.conf 
b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index f6b09b9..6e24bd9 100644
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -130,7 +130,8 @@ masters="ds1,ds2"
 
 # run worker machine
 # note: need to write the worker group name of each worker, the default value 
is "default"
-workersGroup=(["ds1"]="default" ["ds2"]="default" ["ds3"]="default" 
["ds4"]="default" ["ds5"]="default")
+
+declare -A workersGroup=(["ds1"]="default" ["ds2"]="default" ["ds3"]="default" 
["ds4"]="default" ["ds5"]="default")
 
 # run alert machine
 # note: list of machine hostnames for deploying alert server
@@ -141,4 +142,4 @@ alertServer="ds3"
 apiServers="ds1"
 
 # whether to start monitoring self-starting scripts
-monitorServerState="false"
+monitorServerState="false"
\ No newline at end of file
diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh
index adee7d7..6e85566 100644
--- a/script/scp-hosts.sh
+++ b/script/scp-hosts.sh
@@ -40,8 +40,8 @@ do
   for dsDir in bin conf lib script sql ui install.sh
   do
     # if worker in workersGroup
-    if [[ "${map[${host}]}" ]] && [[ "${dsDir}" -eq "conf" ]]; then
-      sed -i ${txt} "s#worker.group.*#worker.group=${map[${host}]}#g" 
$workDir/../conf/worker.properties
+    if [[ "${workersGroup[${host}]}" ]] && [[ "${dsDir}" == "conf" ]]; then
+      sed -i ${txt} "s#worker.group.*#worker.group=${workersGroup[${host}]}#g" 
${dsDir}/worker.properties
     fi
 
     echo "start to scp $dsDir to $host/$installPath"
@@ -49,4 +49,4 @@ do
   done
 
   echo "scp dirs to $host/$installPath complete"
-done
+done
\ No newline at end of file
diff --git a/script/start-all.sh b/script/start-all.sh
index 5579a7d..dda46f0 100644
--- a/script/start-all.sh
+++ b/script/start-all.sh
@@ -43,5 +43,4 @@ for apiServer in ${apiServersHost[@]}
 do
   echo "$apiServer worker server is starting"
   ssh -p $sshPort $apiServer  "cd $installPath/; sh 
bin/dolphinscheduler-daemon.sh start api-server;"
-done
-
+done
\ No newline at end of file
diff --git a/script/stop-all.sh b/script/stop-all.sh
index e4ccf75..e2afd08 100644
--- a/script/stop-all.sh
+++ b/script/stop-all.sh
@@ -43,5 +43,4 @@ for apiServer in ${apiServersHost[@]}
 do
   echo "$apiServer worker server is stopping"
   ssh -p $sshPort $apiServer  "cd $installPath/; sh 
bin/dolphinscheduler-daemon.sh stop api-server;"
-done
-
+done
\ No newline at end of file