Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tkv
This commit is contained in:
commit
3c512df931
|
@ -6,17 +6,16 @@ set -e
|
|||
#set -x
|
||||
|
||||
# deployCluster.sh
|
||||
curr_dir=$(readlink -f "$(dirname "$0")")
|
||||
echo $curr_dir
|
||||
|
||||
curr_dir=$(pwd)
|
||||
echo "currect pwd: ${curr_dir}"
|
||||
${curr_dir}/cleanCluster.sh -r "/data"
|
||||
${curr_dir}/cleanCluster.sh -r "/data2"
|
||||
|
||||
./cleanCluster.sh -r "/data"
|
||||
./cleanCluster.sh -r "/data2"
|
||||
${curr_dir}/compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0"
|
||||
|
||||
./compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0"
|
||||
|
||||
./setupDnodes.sh -r "/data" -n 1 -f "trd02:7000" -p 7000
|
||||
./setupDnodes.sh -r "/data2" -n 1 -f "trd02:7000" -p 8000
|
||||
${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 2 -f trd02:7000 -p 7000
|
||||
#./setupDnodes.sh -r "/data2" -n 2 -f trd02:7000 -p 8000
|
||||
|
|
|
@ -121,7 +121,7 @@ startDnodes() {
|
|||
############################### main process ##########################################
|
||||
|
||||
## kill all taosd process
|
||||
kill_process taosd
|
||||
#kill_process taosd
|
||||
|
||||
## create director for all dnode
|
||||
if [[ "$enviMode" == "new" ]]; then
|
||||
|
|
Loading…
Reference in New Issue