From 8ad17efeb56ad35d3a5252bcb0b7993c768b9c12 Mon Sep 17 00:00:00 2001 From: Jiajie Zhong Date: Thu, 26 May 2022 09:59:40 +0800 Subject: [PATCH] [fix] Deploy scp-hosts use fullpath avoid dangling (#10249) This path fix error modify worker application.yaml when running `scp-hosts.sh` script in different directory. Currently setting only work when running `scp-hosts.sh` in path `/bin` using command `./scp-hosts.sh`. And will fail when we run script in directory `` using command `./bin/scp-hosts.sh` ref: #10209 and #10208 (cherry picked from commit 58afe5d8b5a76460bb058eec1c15447a4d6ba7be) --- script/scp-hosts.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh index 25b688170a..285f3280b2 100755 --- a/script/scp-hosts.sh +++ b/script/scp-hosts.sh @@ -47,7 +47,7 @@ do fi done # set worker groups in application.yaml - [[ -n ${workerIndex} ]] && sed -i "s/- default/- ${groupNames[$workerIndex]}/" ../worker-server/conf/application.yaml + [[ -n ${workerIndex} ]] && sed -i "s/- default/- ${groupNames[$workerIndex]}/" $workDir/../worker-server/conf/application.yaml for dsDir in bin master-server worker-server alert-server api-server ui tools do @@ -56,7 +56,7 @@ do scp -q -P $sshPort -r $workDir/../$dsDir $host:$installPath done # restore worker groups to default - [[ -n ${workerIndex} ]] && sed -i "s/- ${groupNames[$workerIndex]}/- default/" ../worker-server/conf/application.yaml + [[ -n ${workerIndex} ]] && sed -i "s/- ${groupNames[$workerIndex]}/- default/" $workDir/../worker-server/conf/application.yaml echo "scp dirs to $host/$installPath complete" done