Browse Source

fix worker group config no effect (#2719)

dailidong 4 years ago
parent
commit
f26d2a7c20

+ 3 - 2
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"

+ 3 - 3
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

+ 1 - 2
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

+ 1 - 2
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