xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tkv

This commit is contained in:
Hongze Cheng 2022-01-19 02:10:50 +00:00
parent 0d0bc0d105 ee7393e589
commit 3c512df931
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/script/sh/massiveTable/deployCluster.sh
View File

@ -6,17 +6,16 @@ set -e
#set -x #set -x
# deployCluster.sh # deployCluster.sh
curr_dir=$(readlink -f "$(dirname "$0")")
echo $curr_dir
curr_dir=$(pwd) ${curr_dir}/cleanCluster.sh -r "/data"
echo "currect pwd: ${curr_dir}" ${curr_dir}/cleanCluster.sh -r "/data2"
./cleanCluster.sh -r "/data" ${curr_dir}/compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0"
./cleanCluster.sh -r "/data2"
./compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0" ${curr_dir}/setupDnodes.sh -r "/data" -n 1 -f "trd02:7000" -p 7000
${curr_dir}/setupDnodes.sh -r "/data2" -n 1 -f "trd02:7000" -p 8000
./setupDnodes.sh -r "/data" -n 1 -f "trd02:7000" -p 7000
./setupDnodes.sh -r "/data2" -n 1 -f "trd02:7000" -p 8000
#./setupDnodes.sh -r "/data" -n 2 -f trd02:7000 -p 7000 #./setupDnodes.sh -r "/data" -n 2 -f trd02:7000 -p 7000
#./setupDnodes.sh -r "/data2" -n 2 -f trd02:7000 -p 8000 #./setupDnodes.sh -r "/data2" -n 2 -f trd02:7000 -p 8000

2
tests/script/sh/massiveTable/setupDnodes.sh
View File

@ -121,7 +121,7 @@ startDnodes() {
############################### main process ########################################## ############################### main process ##########################################
## kill all taosd process ## kill all taosd process
kill_process taosd #kill_process taosd
## create director for all dnode ## create director for all dnode
if [[ "$enviMode" == "new" ]]; then if [[ "$enviMode" == "new" ]]; then