diff --git a/tests/script/general/user/authority.sim b/tests/script/general/user/authority.sim index 7ae8c6f1a4e39d82074bd03bb2bc8e8c87bb3717..71f185043b3ef8fbe0fb09d53c9d4dae372d41fa 100644 --- a/tests/script/general/user/authority.sim +++ b/tests/script/general/user/authority.sim @@ -63,4 +63,4 @@ sql close sql connect sleep 2000 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index eb392bb00bef86b5228a725b715081efbf85e81e..b2416611cf70c44dbe17c97cec1912ee6e9cb203 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -1,5 +1,3 @@ -cd ../../debug; cmake .. -cd ../../debug; make cd ../../../debug; cmake .. cd ../../../debug; make @@ -61,7 +59,7 @@ cd ../../../debug; make ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/delete.sim -./test.sh -f general/db/dropdnodes.sim +#not test ./test.sh -f general/db/dropdnodes.sim ./test.sh -f general/db/len.sim ./test.sh -f general/db/repeat.sim ./test.sh -f general/db/tables.sim @@ -235,78 +233,78 @@ cd ../../../debug; make ./test.sh -f general/vector/table_query.sim ./test.sh -f general/vector/table_time.sim -./test.sh -u -f unique/account/account_create.sim -./test.sh -u -f unique/account/account_delete.sim -./test.sh -u -f unique/account/account_len.sim -./test.sh -u -f unique/account/authority.sim -./test.sh -u -f unique/account/basic.sim -./test.sh -u -f unique/account/paras.sim -./test.sh -u -f unique/account/pass_alter.sim -./test.sh -u -f unique/account/pass_len.sim -./test.sh -u -f unique/account/usage.sim -./test.sh -u -f unique/account/user_create.sim -./test.sh -u -f unique/account/user_len.sim +./test.sh -f unique/account/account_create.sim +./test.sh -f unique/account/account_delete.sim +./test.sh -f unique/account/account_len.sim +./test.sh -f unique/account/authority.sim +./test.sh -f unique/account/basic.sim +./test.sh -f unique/account/paras.sim +./test.sh -f unique/account/pass_alter.sim +./test.sh -f unique/account/pass_len.sim +./test.sh -f unique/account/usage.sim +./test.sh -f unique/account/user_create.sim +./test.sh -f unique/account/user_len.sim -./test.sh -u -f unique/big/balance.sim -./test.sh -u -f unique/big/maxvnodes.sim -./test.sh -u -f unique/big/tcp.sim +./test.sh -f unique/big/balance.sim +./test.sh -f unique/big/maxvnodes.sim +./test.sh -f unique/big/tcp.sim -./test.sh -u -f unique/cluster/balance1.sim -./test.sh -u -f unique/cluster/balance2.sim -./test.sh -u -f unique/cluster/balance3.sim -./test.sh -u -f unique/cluster/cache.sim +./test.sh -f unique/cluster/balance1.sim +./test.sh -f unique/cluster/balance2.sim +./test.sh -f unique/cluster/balance3.sim +./test.sh -f unique/cluster/cache.sim -./test.sh -u -f unique/column/replica3.sim +./test.sh -f unique/column/replica3.sim -./test.sh -u -f unique/db/commit.sim -./test.sh -u -f unique/db/delete.sim -./test.sh -u -f unique/db/delete_part.sim -./test.sh -u -f unique/db/replica_add12.sim -./test.sh -u -f unique/db/replica_add13.sim -./test.sh -u -f unique/db/replica_add23.sim -./test.sh -u -f unique/db/replica_reduce21.sim -./test.sh -u -f unique/db/replica_reduce32.sim -./test.sh -u -f unique/db/replica_reduce31.sim -./test.sh -u -f unique/db/replica_part.sim +./test.sh -f unique/db/commit.sim +./test.sh -f unique/db/delete.sim +./test.sh -f unique/db/delete_part.sim +./test.sh -f unique/db/replica_add12.sim +./test.sh -f unique/db/replica_add13.sim +./test.sh -f unique/db/replica_add23.sim +./test.sh -f unique/db/replica_reduce21.sim +./test.sh -f unique/db/replica_reduce32.sim +./test.sh -f unique/db/replica_reduce31.sim +./test.sh -f unique/db/replica_part.sim -./test.sh -u -f unique/dnode/alternativeRole.sim -./test.sh -u -f unique/dnode/balance1.sim -./test.sh -u -f unique/dnode/balance2.sim -./test.sh -u -f unique/dnode/balance3.sim -./test.sh -u -f unique/dnode/balancex.sim -./test.sh -u -f unique/dnode/offline1.sim -./test.sh -u -f unique/dnode/offline2.sim -./test.sh -u -f unique/dnode/remove1.sim -./test.sh -u -f unique/dnode/remove2.sim -./test.sh -u -f unique/dnode/vnode_clean.sim +./test.sh -f unique/dnode/alternativeRole.sim +./test.sh -f unique/dnode/balance1.sim +./test.sh -f unique/dnode/balance2.sim +./test.sh -f unique/dnode/balance3.sim +./test.sh -f unique/dnode/balancex.sim +./test.sh -f unique/dnode/offline1.sim +./test.sh -f unique/dnode/offline2.sim +./test.sh -f unique/dnode/remove1.sim +./test.sh -f unique/dnode/remove2.sim +./test.sh -f unique/dnode/vnode_clean.sim -./test.sh -u -f unique/http/admin.sim -./test.sh -u -f unique/http/opentsdb.sim +./test.sh -f unique/http/admin.sim +./test.sh -f unique/http/opentsdb.sim -./test.sh -u -f unique/import/replica2.sim -./test.sh -u -f unique/import/replica3.sim +./test.sh -f unique/import/replica2.sim +./test.sh -f unique/import/replica3.sim -./test.sh -u -f unique/stable/balance_replica1.sim -./test.sh -u -f unique/stable/dnode2_stop.sim -./test.sh -u -f unique/stable/dnode2.sim -./test.sh -u -f unique/stable/dnode3.sim -./test.sh -u -f unique/stable/replica2_dnode4.sim -./test.sh -u -f unique/stable/replica2_vnode3.sim -./test.sh -u -f unique/stable/replica3_dnode6.sim -./test.sh -u -f unique/stable/replica3_vnode3.sim +./test.sh -f unique/stable/balance_replica1.sim +./test.sh -f unique/stable/dnode2_stop.sim +./test.sh -f unique/stable/dnode2.sim +./test.sh -f unique/stable/dnode3.sim +./test.sh -f unique/stable/replica2_dnode4.sim +./test.sh -f unique/stable/replica2_vnode3.sim +./test.sh -f unique/stable/replica3_dnode6.sim +./test.sh -f unique/stable/replica3_vnode3.sim -./test.sh -u -f unique/mnode/mgmt22.sim -./test.sh -u -f unique/mnode/mgmt23.sim -./test.sh -u -f unique/mnode/mgmt24.sim -./test.sh -u -f unique/mnode/mgmt25.sim -./test.sh -u -f unique/mnode/mgmt26.sim -./test.sh -u -f unique/mnode/mgmt33.sim -./test.sh -u -f unique/mnode/mgmt34.sim -./test.sh -u -f unique/mnode/mgmtr2.sim +./test.sh -f unique/mnode/mgmt22.sim +./test.sh -f unique/mnode/mgmt23.sim +./test.sh -f unique/mnode/mgmt24.sim +./test.sh -f unique/mnode/mgmt25.sim +./test.sh -f unique/mnode/mgmt26.sim +./test.sh -f unique/mnode/mgmt33.sim +./test.sh -f unique/mnode/mgmt34.sim +./test.sh -f unique/mnode/mgmtr2.sim -./test.sh -u -f unique/vnode/many.sim -./test.sh -u -f unique/vnode/replica2_basic2.sim -./test.sh -u -f unique/vnode/replica2_repeat.sim -./test.sh -u -f unique/vnode/replica3_basic.sim -./test.sh -u -f unique/vnode/replica3_repeat.sim -./test.sh -u -f unique/vnode/replica3_vgroup.sim +./test.sh -f unique/vnode/many.sim +./test.sh -f unique/vnode/replica2_basic2.sim +./test.sh -f unique/vnode/replica2_repeat.sim +./test.sh -f unique/vnode/replica3_basic.sim +./test.sh -f unique/vnode/replica3_repeat.sim +./test.sh -f unique/vnode/replica3_vgroup.sim diff --git a/tests/script/jenkins/sync.txt b/tests/script/jenkins/sync.txt index 934680b7c0c42974a40025afd6f0226e1a6ccf9c..4f194cde93dfe29280d1e11ccf84308f0d9c3644 100644 --- a/tests/script/jenkins/sync.txt +++ b/tests/script/jenkins/sync.txt @@ -1,79 +1,77 @@ -cd ../../debug; cmake .. -cd ../../debug; make cd ../../../debug; cmake .. cd ../../../debug; make -./test.sh -u -f unique/account/account_create.sim -./test.sh -u -f unique/account/account_delete.sim -./test.sh -u -f unique/account/account_len.sim -./test.sh -u -f unique/account/authority.sim -./test.sh -u -f unique/account/basic.sim -./test.sh -u -f unique/account/paras.sim -./test.sh -u -f unique/account/pass_alter.sim -./test.sh -u -f unique/account/pass_len.sim -./test.sh -u -f unique/account/usage.sim -./test.sh -u -f unique/account/user_create.sim -./test.sh -u -f unique/account/user_len.sim +./test.sh -f unique/account/account_create.sim +./test.sh -f unique/account/account_delete.sim +./test.sh -f unique/account/account_len.sim +./test.sh -f unique/account/authority.sim +./test.sh -f unique/account/basic.sim +./test.sh -f unique/account/paras.sim +./test.sh -f unique/account/pass_alter.sim +./test.sh -f unique/account/pass_len.sim +./test.sh -f unique/account/usage.sim +./test.sh -f unique/account/user_create.sim +./test.sh -f unique/account/user_len.sim -./test.sh -u -f unique/big/balance.sim -./test.sh -u -f unique/big/maxvnodes.sim -./test.sh -u -f unique/big/tcp.sim +./test.sh -f unique/big/balance.sim +./test.sh -f unique/big/maxvnodes.sim +./test.sh -f unique/big/tcp.sim -./test.sh -u -f unique/cluster/balance1.sim -./test.sh -u -f unique/cluster/balance2.sim -./test.sh -u -f unique/cluster/balance3.sim -./test.sh -u -f unique/cluster/cache.sim +./test.sh -f unique/cluster/balance1.sim +./test.sh -f unique/cluster/balance2.sim +./test.sh -f unique/cluster/balance3.sim +./test.sh -f unique/cluster/cache.sim -./test.sh -u -f unique/column/replica3.sim +./test.sh -f unique/column/replica3.sim -./test.sh -u -f unique/db/commit.sim -./test.sh -u -f unique/db/delete.sim -./test.sh -u -f unique/db/delete_part.sim -./test.sh -u -f unique/db/replica_add12.sim -./test.sh -u -f unique/db/replica_add13.sim -./test.sh -u -f unique/db/replica_add23.sim -./test.sh -u -f unique/db/replica_reduce21.sim -./test.sh -u -f unique/db/replica_reduce32.sim -./test.sh -u -f unique/db/replica_reduce31.sim -./test.sh -u -f unique/db/replica_part.sim +./test.sh -f unique/db/commit.sim +./test.sh -f unique/db/delete.sim +./test.sh -f unique/db/delete_part.sim +./test.sh -f unique/db/replica_add12.sim +./test.sh -f unique/db/replica_add13.sim +./test.sh -f unique/db/replica_add23.sim +./test.sh -f unique/db/replica_reduce21.sim +./test.sh -f unique/db/replica_reduce32.sim +./test.sh -f unique/db/replica_reduce31.sim +./test.sh -f unique/db/replica_part.sim -./test.sh -u -f unique/dnode/balance1.sim -./test.sh -u -f unique/dnode/balance2.sim -./test.sh -u -f unique/dnode/balance3.sim -./test.sh -u -f unique/dnode/balancex.sim -./test.sh -u -f unique/dnode/offline1.sim -./test.sh -u -f unique/dnode/offline2.sim -./test.sh -u -f unique/dnode/remove1.sim -./test.sh -u -f unique/dnode/remove2.sim -./test.sh -u -f unique/dnode/vnode_clean.sim +./test.sh -f unique/dnode/balance1.sim +./test.sh -f unique/dnode/balance2.sim +./test.sh -f unique/dnode/balance3.sim +./test.sh -f unique/dnode/balancex.sim +./test.sh -f unique/dnode/offline1.sim +./test.sh -f unique/dnode/offline2.sim +./test.sh -f unique/dnode/remove1.sim +./test.sh -f unique/dnode/remove2.sim +./test.sh -f unique/dnode/vnode_clean.sim -./test.sh -u -f unique/http/admin.sim -./test.sh -u -f unique/http/opentsdb.sim +./test.sh -f unique/http/admin.sim +./test.sh -f unique/http/opentsdb.sim -./test.sh -u -f unique/import/replica2.sim -./test.sh -u -f unique/import/replica3.sim +./test.sh -f unique/import/replica2.sim +./test.sh -f unique/import/replica3.sim -./test.sh -u -f unique/stable/balance_replica1.sim -./test.sh -u -f unique/stable/dnode2_stop.sim -./test.sh -u -f unique/stable/dnode2.sim -./test.sh -u -f unique/stable/dnode3.sim -./test.sh -u -f unique/stable/replica2_dnode4.sim -./test.sh -u -f unique/stable/replica2_vnode3.sim -./test.sh -u -f unique/stable/replica3_dnode6.sim -./test.sh -u -f unique/stable/replica3_vnode3.sim +./test.sh -f unique/stable/balance_replica1.sim +./test.sh -f unique/stable/dnode2_stop.sim +./test.sh -f unique/stable/dnode2.sim +./test.sh -f unique/stable/dnode3.sim +./test.sh -f unique/stable/replica2_dnode4.sim +./test.sh -f unique/stable/replica2_vnode3.sim +./test.sh -f unique/stable/replica3_dnode6.sim +./test.sh -f unique/stable/replica3_vnode3.sim -./test.sh -u -f unique/mnode/mgmt22.sim -./test.sh -u -f unique/mnode/mgmt23.sim -./test.sh -u -f unique/mnode/mgmt24.sim -./test.sh -u -f unique/mnode/mgmt25.sim -./test.sh -u -f unique/mnode/mgmt26.sim -./test.sh -u -f unique/mnode/mgmt33.sim -./test.sh -u -f unique/mnode/mgmt34.sim -./test.sh -u -f unique/mnode/mgmtr2.sim +./test.sh -f unique/mnode/mgmt22.sim +./test.sh -f unique/mnode/mgmt23.sim +./test.sh -f unique/mnode/mgmt24.sim +./test.sh -f unique/mnode/mgmt25.sim +./test.sh -f unique/mnode/mgmt26.sim +./test.sh -f unique/mnode/mgmt33.sim +./test.sh -f unique/mnode/mgmt34.sim +./test.sh -f unique/mnode/mgmtr2.sim -./test.sh -u -f unique/vnode/many.sim -./test.sh -u -f unique/vnode/replica2_basic2.sim -./test.sh -u -f unique/vnode/replica2_repeat.sim -./test.sh -u -f unique/vnode/replica3_basic.sim -./test.sh -u -f unique/vnode/replica3_repeat.sim -./test.sh -u -f unique/vnode/replica3_vgroup.sim +./test.sh -f unique/vnode/many.sim +./test.sh -f unique/vnode/replica2_basic2.sim +./test.sh -f unique/vnode/replica2_repeat.sim +./test.sh -f unique/vnode/replica3_basic.sim +./test.sh -f unique/vnode/replica3_repeat.sim +./test.sh -f unique/vnode/replica3_vgroup.sim diff --git a/tests/script/sh/exec_up.sh b/tests/script/sh/exec_up.sh deleted file mode 100755 index 51ad03fe99d3b82cb8de6683e668e45e952a7fb8..0000000000000000000000000000000000000000 --- a/tests/script/sh/exec_up.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# if [ $# != 4 || $# != 5 ]; then - # echo "argument list need input : " - # echo " -n nodeName" - # echo " -s start/stop" - # echo " -c clear" - # exit 1 -# fi - -NODE_NAME= -EXEC_OPTON= -CLEAR_OPTION="false" -while getopts "n:s:u:x:ct" arg -do - case $arg in - n) - NODE_NAME=$OPTARG - ;; - s) - EXEC_OPTON=$OPTARG - ;; - c) - CLEAR_OPTION="clear" - ;; - t) - SHELL_OPTION="true" - ;; - u) - USERS=$OPTARG - ;; - x) - SIGNAL=$OPTARG - ;; - ?) - echo "unkown argument" - ;; - esac -done - -SCRIPT_DIR=`dirname $0` -cd $SCRIPT_DIR/../ -SCRIPT_DIR=`pwd` - -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then - cd ../../.. -else - cd ../../ -fi - -TAOS_DIR=`pwd` - -BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3` - -BUILD_DIR=$TAOS_DIR/$BIN_DIR - -SIM_DIR=$TAOS_DIR/sim -NODE_DIR=$SIM_DIR/$NODE_NAME -EXE_DIR=$BUILD_DIR/bin -CFG_DIR=$NODE_DIR/cfg -LOG_DIR=$NODE_DIR/log -DATA_DIR=$NODE_DIR/data -MGMT_DIR=$NODE_DIR/data/mgmt -TSDB_DIR=$NODE_DIR/data/tsdb - -TAOS_CFG=$NODE_DIR/cfg/taos.cfg - -echo ------------ $EXEC_OPTON $NODE_NAME - -TAOS_FLAG=$SIM_DIR/tsim/flag -if [ -f "$TAOS_FLAG" ]; then - EXE_DIR=/usr/local/bin/taos -fi - -if [ "$CLEAR_OPTION" = "clear" ]; then - echo rm -rf $MGMT_DIR $TSDB_DIR - rm -rf $TSDB_DIR - rm -rf $MGMT_DIR -fi - -if [ "$EXEC_OPTON" = "start" ]; then - echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR - - if [ "$SHELL_OPTION" = "true" ]; then - nohup valgrind --log-file=${LOG_DIR}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & - else - nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & - fi - - #TT=`date +%s` - #mkdir ${LOG_DIR}/${TT} - #echo valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR - #nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & - -else - #relative path - RCFG_DIR=sim/$NODE_NAME/cfg - PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'` - if [ -n "$PID" ]; then - if [ "$SIGNAL" = "SIGINT" ]; then - echo killed by signal - kill -sigint $PID - else - kill -9 $PID - fi - fi -fi - diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim index 1966e1a7ce745bcbc8760a703b1b30824dea67a2..9eecceb39d106ab335b631bcfae370c2ae516490 100644 --- a/tests/script/unique/account/account_create.sim +++ b/tests/script/unique/account/account_create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -77,4 +77,4 @@ if $rows != 1 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim index 40075dc1a6dc314b5b309670d6a51e89f949e84e..564512228eda3aa156faba4818e3bc150b69de76 100644 --- a/tests/script/unique/account/account_delete.sim +++ b/tests/script/unique/account/account_delete.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -96,4 +96,4 @@ if $rows != 1 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim index 81d0f0bfb134a4282823b40602bf53583ea17d90..75636be513af84ba00d9052d09193dcbf9ee2158 100644 --- a/tests/script/unique/account/account_len.sim +++ b/tests/script/unique/account/account_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -89,4 +89,4 @@ if $rows != 3 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim index 2bb61cb0f28a180ef1960943717f0db2136b17ec..2270c2888747f4e3e3bc7cdf4a0352819256889e 100644 --- a/tests/script/unique/account/authority.sim +++ b/tests/script/unique/account/authority.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -344,4 +344,4 @@ sql drop database d2 sql drop database d3 sql drop database d4 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim index adbc84d76679fee4ccd49f6951edb11c3b7df670..0861c9305b836eb96c62acf11a8cad21ec6212a3 100644 --- a/tests/script/unique/account/basic.sim +++ b/tests/script/unique/account/basic.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -43,4 +43,4 @@ endi print $data00 $data01 $data02 print $data10 $data11 $data22 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim index 70a423f70f583734d69f6bda59f98a9a4ae4c3eb..60c08b21e9fdcdadd7af27b3aa19575a25342531 100644 --- a/tests/script/unique/account/paras.sim +++ b/tests/script/unique/account/paras.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -111,4 +111,4 @@ if $data16 != 0.000/10.000 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index 644548be0bd49da1d015cd480b5b88435fbbe588..bf939acce37cb2d878f1e31ca01e11429d8d4fcb 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -113,4 +113,4 @@ sql drop account oroot sql drop user read sql drop user write -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim index 370ea94200b9aa860af69ac360d3058553e8cb74..1dd0a616f291549cf3e431348fe028114f11836d 100644 --- a/tests/script/unique/account/pass_len.sim +++ b/tests/script/unique/account/pass_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -78,4 +78,4 @@ if $rows != 3 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim index 63c3d49f43e0d41f64bb6e011b5071cd893ec3ef..c1c5d7572888bae7d0360fc901a9688885e510b9 100644 --- a/tests/script/unique/account/usage.sim +++ b/tests/script/unique/account/usage.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -57,4 +57,4 @@ endi print =============== check grant sql_error create database d6 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim index 2a647862252f6d00e20c95f60ef49a66adc3375e..029bda22ea5a192634c911bba1df74a266402fea 100644 --- a/tests/script/unique/account/user_create.sim +++ b/tests/script/unique/account/user_create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -81,4 +81,4 @@ step42: sql drop user read -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim index 1163ac2e4be84b974a30997a38ab9cbb9db1c696..91a5ebfaaba09196ff62196b23e60b59784ee1eb 100644 --- a/tests/script/unique/account/user_len.sim +++ b/tests/script/unique/account/user_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -91,4 +91,4 @@ if $rows != 1 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim index b3b1e0fe2262fc0c50c74202c71da7333adcddca..34d7981e8adb88c729492a728d923f8732969b0b 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim @@ -56,13 +56,13 @@ print ============== step0: start tarbitrator system sh/exec_tarbitrator.sh -s start print ============== step1: start dnode1, only deploy mnode -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 1000 sql create dnode $hostname2 sql create dnode $hostname3 @@ -108,7 +108,7 @@ if $data00 != $totalRows then endi print ============== step3: add one new dnode4 expect auto balancing -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sql create dnode $hostname4 sleep 10000 sql select count(*) from $stb @@ -119,7 +119,7 @@ endi print ============== step4: stop dnode3, after offlineThreshold, dnode3 will be dropped for cluster -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode3 -s stop sql select count(*) from $stb print data00 $data00 if $data00 != $totalRows then @@ -182,7 +182,7 @@ endi print ============== step5: start dnode5 and add into cluster , drop database sql drop database $db sleep 1000 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start sql create dnode $hostname5 sleep 3000 wait_dnode5: diff --git a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim index fd69d955c3a33073ef1391c499bd7ea66f716839..dd6cdfdcf2d059520f197c4547da2122b7585942 100644 --- a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim +++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim @@ -24,7 +24,7 @@ system sh/exec_tarbitrator.sh -s start print ============== step1: replica is 1, and start 1 dnode -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -58,7 +58,7 @@ while $i < $tblNum endw print ============== step2: add 1 new dnode, expect balanced -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 # expect after balanced, 2 vondes in dnode1, 1 vonde in dnode2 @@ -81,7 +81,7 @@ if $data2_2 != 1 then endi print ============== step4: stop dnode1, and wait dnode2 master -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop $x = 0 loop_wait: diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 5259f415c88da90c99372ee2f81786d2743fddbc..09fca14931a74d2da342ffbd6bc4f25951230e20 100644 --- a/tests/script/unique/big/balance.sim +++ b/tests/script/unique/big/balance.sim @@ -20,7 +20,7 @@ system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 1000 print =============== prepare data -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -87,7 +87,7 @@ endi print ========== step1 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show1: @@ -142,7 +142,7 @@ endi print ========== step2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 10000 print ========== step3 @@ -170,7 +170,7 @@ if $data2_3 != 2 then goto show3 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -226,7 +226,7 @@ if $data2_3 != null then goto show4 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -262,7 +262,7 @@ if $data00 != $totalNum then endi print ========== step5 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sql create dnode $hostname4 sleep 3000 @@ -319,11 +319,11 @@ if $data00 != $totalNum then goto show5 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index f019ea607c6b1097e12e2aa788c8b69656ce23cf..ab93474a436b851bbfa4cf6cb19e715dc4b704d1 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -15,7 +15,7 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v $totalVnodes print ========== prepare data -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create database db blocks 2 cache 1 maxTables $maxTables @@ -45,7 +45,7 @@ endi print ========== step3 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show3: @@ -78,11 +78,11 @@ endi return -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/big/restartSpeed.sim b/tests/script/unique/big/restartSpeed.sim index 5ab77f5fa6be4ade4565493fb446c98fa7f3a0b4..94c687d329c70043d6d4b492a67863829bc2b2d3 100644 --- a/tests/script/unique/big/restartSpeed.sim +++ b/tests/script/unique/big/restartSpeed.sim @@ -15,7 +15,7 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v $totalVnodes print ========== prepare data -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create database db blocks 2 cache 1 maxTables $maxTables @@ -33,11 +33,11 @@ while $x < $totalRows endw -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index 590035c0f8afa38e57248e586ebb361e71b2da3f..38cb667ec03b400e29cc1017f616434b650375d4 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -14,7 +14,7 @@ system sh/cfg.sh -n dnode1 -c adminDebugFlag -v 131 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 system sh/cfg.sh -n dnode1 -c debugFlag -v 131 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect print ======================== dnode1 start @@ -104,11 +104,11 @@ while $i < 10 $i = $i + 1 endw -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index 47b23d16c996a483de9fc23027d4e5b3b93c541a..80dfd81e343a8bf637fde037c43921da5ac10959 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -46,7 +46,7 @@ system sh/cfg.sh -n dnode8 -c wallevel -v 1 print ============== step1 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create database c_b1_d1 maxTables 4 @@ -85,7 +85,7 @@ print ============================== step2 print ========= start dnode2 sleep 2000 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 $x = 0 @@ -162,9 +162,9 @@ print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 9000 @@ -251,7 +251,7 @@ endi print ============================== step9 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 9000 $x = 0 @@ -333,7 +333,7 @@ sql_error create table c_b1_t5 (t timestamp, i int) -x error3 print ============================== step13 sql create dnode $hostname5 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start sleep 9000 sql show mnodes @@ -381,7 +381,7 @@ endi print ============================== step14 sql create dnode $hostname6 -system sh/exec_up.sh -n dnode6 -s start +system sh/exec.sh -n dnode6 -s start sleep 15000 sql create database c_b1_d7 maxTables 4 @@ -554,11 +554,11 @@ if $data41 != 85 then endi print ============================================ over= -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 48670ee9b1feb58b849c2743ef6e153583c2658f..bb27a2aadbdfb351eeac2524ef4890415ba1db94 100644 --- a/tests/script/unique/cluster/balance2.sim +++ b/tests/script/unique/cluster/balance2.sim @@ -46,14 +46,14 @@ system sh/cfg.sh -n dnode8 -c mnodeEqualVnodeNum -v 0 print ============== step1 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 4001 sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 4001 sql create database c_b2_d1 replica 2 maxTables 4 @@ -148,12 +148,12 @@ print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ============================== step3 print ========= start dnode4 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 10000 $x = 0 @@ -259,12 +259,12 @@ if $dnode4Role != slave then return -1 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT print ============================== step5 print ========= start dnode3 sql create dnode $hostname5 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start sleep 9000 $x = 0 @@ -301,7 +301,7 @@ print dnode4 ==> $dnode4Role print dnode5 ==> $dnode5Role print ============================== step6 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT print stop dnode1 and sleep 10000 sleep 10000 @@ -322,7 +322,7 @@ if $dnode1Role != offline then endi print ============================== step6.1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start $x = 0 show6: @@ -357,7 +357,7 @@ print dnode1 ==> $dnode1Role print dnode4 ==> $dnode4Role print dnode5 ==> $dnode5Role -#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +#system sh/exec.sh -n dnode1 -s stop -x SIGINT print ============================== step12 print ========= check data @@ -421,11 +421,11 @@ if $data41 != 35 then endi print ============================================ over -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index 4f53a04daf1a7b90a684183fe1e68f0d1a008343..77eba2a2a50cf44c157584a0560e428e0aea72cc 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -47,14 +47,14 @@ system sh/cfg.sh -n dnode8 -c wallevel -v 1 print ============== step1 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 2001 sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3001 sql create database c_b3_d1 replica 3 @@ -117,7 +117,7 @@ endi print ============================== step2 print ========= start dnode4 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 9000 $x = 0 @@ -176,11 +176,11 @@ if $dnode4Vnodes != 3 then goto show3 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ============================== step4 sql create dnode $hostname5 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start sleep 10000 $x = 0 @@ -239,11 +239,11 @@ if $dnode4Vnodes != 3 then goto show5 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT print ============================== step6 sql create dnode $hostname6 -system sh/exec_up.sh -n dnode6 -s start +system sh/exec.sh -n dnode6 -s start sleep 9000 $x = 0 @@ -302,11 +302,11 @@ if $dnode4Vnodes != null then goto show7 endi -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT print ============================== step8 sql create dnode $hostname7 -system sh/exec_up.sh -n dnode7 -s start +system sh/exec.sh -n dnode7 -s start sleep 9000 $x = 0 @@ -332,7 +332,7 @@ endi print ============================== step9 print ========= drop dnode1 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT print stop dnode1 and sleep 10000 sleep 10000 @@ -353,7 +353,7 @@ if $dnode1Role != offline then endi print ============================== step9.1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start $x = 0 show9: @@ -380,7 +380,7 @@ if $dnode7Vnodes != 3 then goto show9 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT print ============================== step11 print ========= add db4 @@ -428,7 +428,7 @@ if $dnode7Vnodes != 4 then goto show11 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT print ============================== step13 sql reset query cache @@ -492,11 +492,11 @@ if $data41 != 35 then endi print ============================================ over -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim index d294bf0a57719b08e741fbcea07297b58200bab3..c21f71dc2c6e9eefb0d61f81c38e08cfe4d95cf1 100644 --- a/tests/script/unique/column/replica3.sim +++ b/tests/script/unique/column/replica3.sim @@ -10,12 +10,12 @@ system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sql create database db replica 3 sql use db @@ -33,11 +33,11 @@ sql_error create database d1 replica 2 wal 0 sql create database d2 replica 1 wal 0 sql_error alter database d2 replica 2 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim index 4cef0c56380cb630f2c7ee8fbcc93627620d136e..98256b01dc71e1a4fef1fe6016a91c2a949355e6 100644 --- a/tests/script/unique/db/commit.sim +++ b/tests/script/unique/db/commit.sim @@ -14,13 +14,13 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4 print ========= start dnode1 as master -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 3000 print ========= start other dnodes sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 print ======== step1 create db @@ -47,9 +47,9 @@ if $data01 != 40 then endi print ======== step2 stop dnode -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 sql select * from tb order by ts desc @@ -98,9 +98,9 @@ if $data01 != 40 then endi print ======== step5 stop dnode -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 sql select * from tb @@ -115,11 +115,11 @@ if $data01 != 40 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim index 1f9d27218321134d4d92979fc45a2414b13df287..d9b6e8a9f9b40926a7eb26402139a4f7632a4202 100644 --- a/tests/script/unique/db/delete.sim +++ b/tests/script/unique/db/delete.sim @@ -14,13 +14,13 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start print ======== step1 sql create database db replica 3 blocks 2 maxtables 1000 @@ -65,14 +65,14 @@ endi print ======== step3 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 1000 -system sh/exec_up.sh -n dnode1 -s start -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode1 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 step3: @@ -90,11 +90,11 @@ endi sleep 1000 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim index a4ad615f60234c6cb928e95ffe60888389130097..ac84382be42e9f7c5f39aa9072acc1e40dae6834 100644 --- a/tests/script/unique/db/delete_part.sim +++ b/tests/script/unique/db/delete_part.sim @@ -30,11 +30,11 @@ system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $loop = 0 begin: @@ -137,14 +137,14 @@ begin: print ======== step2 $loop - system sh/exec_up.sh -n dnode2 -s stop + system sh/exec.sh -n dnode2 -s stop sleep 1000 print ==> drop database $db sql drop database $db print ======== step3 $loop sleep 2000 - system sh/exec_up.sh -n dnode2 -s start + system sh/exec.sh -n dnode2 -s start sleep 15000 sql show dnodes @@ -175,11 +175,11 @@ begin: goto begin -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim index ec376d4e15fbc928787bf31fa4377dd0746e7ed9..ff0dffe0e2eb41a33d8e22f29684f987c7d4fde3 100644 --- a/tests/script/unique/db/replica_add12.sim +++ b/tests/script/unique/db/replica_add12.sim @@ -26,12 +26,12 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -145,7 +145,7 @@ sql reset query cache sleep 2000 print ========= step5 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql select * from d1.t1 @@ -196,7 +196,7 @@ if $rows != 2 then endi print ========= step6 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 sql insert into d1.t1 values(now, 3) @@ -226,7 +226,7 @@ endi print ========= step61 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 sql_error insert into d1.t1 values(now, 3) @@ -255,7 +255,7 @@ if $rows != 3 then endi print ========= step7 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 sql insert into d1.t1 values(now, 5) @@ -283,11 +283,11 @@ if $rows != 4 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim index f6d1c9012ba346c54e52d8765a3d3db2d70cd114..1b5a01a9fd99b579810c48303352541ff2d5e045 100644 --- a/tests/script/unique/db/replica_add13.sim +++ b/tests/script/unique/db/replica_add13.sim @@ -26,14 +26,14 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 3000 print ======== step1 @@ -139,7 +139,7 @@ endi print ========= step5 sql reset query cache sleep 1000 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(1589529000013, 3) @@ -168,9 +168,9 @@ if $rows != 3 then endi print ========= step6 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(1589529000014, 4) @@ -203,9 +203,9 @@ if $rows != 4 then endi print ========= step7 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(1589529000015, 5) @@ -234,9 +234,9 @@ if $rows != 5 then endi print ========= step8 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 5000 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 sql insert into d1.t1 values(1589529000016, 6) @@ -264,11 +264,11 @@ if $rows != 6 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim index 4defaef153326a078eb46775b2bacf27c458cbc2..67131173d9bda42d28eb734d542a2cd8e1d00c09 100644 --- a/tests/script/unique/db/replica_add23.sim +++ b/tests/script/unique/db/replica_add23.sim @@ -26,14 +26,14 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 3000 print ======== step1 @@ -140,7 +140,7 @@ sql reset query cache sleep 1000 print ========= step5 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(1588262400003, 3) @@ -169,9 +169,9 @@ if $rows != 3 then endi print ========= step6 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(1588262400004, 4) @@ -200,9 +200,9 @@ if $rows != 4 then endi print ========= step7 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(1588262400005, 5) @@ -231,9 +231,9 @@ if $rows != 5 then endi print ========= step8 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 5000 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(1588262400006, 6) @@ -261,11 +261,11 @@ if $rows != 6 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim index 3011fac02c406e90e6acd0c673d21d8fc25fe8d5..0de573285318ea4bbc47037409a3026837a71f31 100644 --- a/tests/script/unique/db/replica_part.sim +++ b/tests/script/unique/db/replica_part.sim @@ -18,12 +18,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -63,7 +63,7 @@ if $rows != 1 then endi print ========= step2 alter db -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql alter database d1 replica 2 sql alter database d2 replica 2 @@ -72,7 +72,7 @@ sql alter database d4 replica 2 sleep 5000 print ========= step3 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 10000 print ========= step4 @@ -102,7 +102,7 @@ if $rows != 2 then endi print ========= step5 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql reset query cache @@ -118,9 +118,9 @@ sql insert into d4.t4 values(now, 3) -x s4 s4: print ========= step6 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(now, 4) -x s5 @@ -133,7 +133,7 @@ sql insert into d4.t4 values(now, 4) -x s8 s8: print ========= step7 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 sql insert into d1.t1 values(now, 5) @@ -146,11 +146,11 @@ sql select * from d2.t2 sql select * from d3.t3 sql select * from d4.t4 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim index efaa4fa95c201569ea7c3469723713a18bb2e2f7..9dc5abcd0df179dc4089a6d425d10d8a8a633eb7 100644 --- a/tests/script/unique/db/replica_reduce21.sim +++ b/tests/script/unique/db/replica_reduce21.sim @@ -18,10 +18,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 print ======== step1 @@ -117,7 +117,7 @@ if $rows != 2 then endi print ======== step9 stop dnode2 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 sql insert into d5.t5 values(now, 3) @@ -145,11 +145,11 @@ if $rows != 3 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim index 98aec8dd19b644e0e4a58ddb9098879da1fdb1ce..af9bcb17bc00d85f4a1d3eaf5f49b6c8e294875e 100644 --- a/tests/script/unique/db/replica_reduce31.sim +++ b/tests/script/unique/db/replica_reduce31.sim @@ -18,12 +18,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -139,7 +139,7 @@ if $rows != 3 then endi print ========= step4 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql reset query cache @@ -155,9 +155,9 @@ sql insert into d4.t4 values(now, 4) -x step4 step4: print ========= step5 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(now, 5) -x step5 @@ -170,7 +170,7 @@ sql insert into d4.t4 values(now, 5) -x step8 step8: print ========= step6 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 sql insert into d1.t1 values(now, 6) @@ -183,11 +183,11 @@ sql select * from d2.t2 sql select * from d3.t3 sql select * from d4.t4 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim index 735f9abb820731a06afa13e9c9925fe767b7ac6e..bc08911a7c35708400c57361344f5115c27430a1 100644 --- a/tests/script/unique/db/replica_reduce32.sim +++ b/tests/script/unique/db/replica_reduce32.sim @@ -18,12 +18,12 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ======== step1 @@ -99,7 +99,7 @@ sql reset query cache sleep 1000 print ========= step4 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 sql insert into d1.t1 values(now, 3) -x step1 @@ -117,10 +117,10 @@ sql select * from d3.t3 sql select * from d4.t4 print ========= step5 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 sql reset query cache @@ -136,7 +136,7 @@ sql insert into d4.t4 values(now, 3) -x step41 step41: print ========= step6 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 sql insert into d1.t1 values(now, 5) @@ -156,11 +156,11 @@ print d3.t3 $rows sql select * from d4.t4 print d4.t4 $rows -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/alternativeRole.sim b/tests/script/unique/dnode/alternativeRole.sim index 7c33cac0dc1a62bb6f56d5a5744c07327cb74fc5..e123ffa426f728b110cc8b38e2d393c5f4392967 100644 --- a/tests/script/unique/dnode/alternativeRole.sim +++ b/tests/script/unique/dnode/alternativeRole.sim @@ -17,13 +17,13 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 sql show dnodes @@ -81,11 +81,11 @@ if $data2_3 != 1 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index a6be723d7c16ce39f0fd76f560b5b107a065130f..5b1615dc289f6910a35a01eb74d9e5bf2c081cf3 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 2 system sh/cfg.sh -n dnode4 -c wallevel -v 2 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 3000 @@ -47,7 +47,7 @@ endi print ========== step2 sleep 2000 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show2: @@ -110,11 +110,11 @@ if $rows != 1 then goto show4 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step5 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 show5: @@ -164,7 +164,7 @@ endi print ========== step7 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 show7: @@ -250,7 +250,7 @@ if $data2_4 != 4 then goto show9 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -328,11 +328,11 @@ if $data41 != 45 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index c60ac145171b71e66a87a63d06925661c2feddb2..374e3dd5ba4539345dd356cc047a0fbd0a9afa14 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -19,13 +19,13 @@ system sh/cfg.sh -n dnode4 -c wallevel -v 1 system sh/cfg.sh -n dnode5 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 sql create database d1 replica 2 maxTables 4 @@ -83,11 +83,11 @@ if $data2_3 != 2 then goto show2 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step3 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 show3: @@ -144,7 +144,7 @@ endi print ========== step5 sql create dnode $hostname5 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start $x = 0 show5: @@ -209,7 +209,7 @@ if $data2_5 != 3 then goto show6 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -269,11 +269,11 @@ if $data41 != 35 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index f0bf0c7c2b7e124cb98d3e1fcbf23f2785bbda49..786b4404ba0da917fbc278d529c33fcce8c75112 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -22,15 +22,15 @@ system sh/cfg.sh -n dnode5 -c wallevel -v 1 system sh/cfg.sh -n dnode6 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode4 -s start sleep 3000 sql create database d1 replica 3 maxTables 4 @@ -98,11 +98,11 @@ if $data2_4 != 2 then goto show2 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step sql create dnode $hostname5 -system sh/exec_up.sh -n dnode5 -s start +system sh/exec.sh -n dnode5 -s start $x = 0 show3: @@ -178,7 +178,7 @@ endi print ========== step5 sql create dnode $hostname6 system sh/deploy.sh -n dnode6 -i 6 -system sh/exec_up.sh -n dnode6 -s start +system sh/exec.sh -n dnode6 -s start $x = 0 show5: @@ -238,7 +238,7 @@ if $data2_5 != 3 then goto show6 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -298,11 +298,11 @@ if $data41 != 35 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index 14b09826784a7d709a7d977347fc5a3116556353..fdb20434ffe542831b43adadfb5bc05605ba029c 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -16,7 +16,7 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 1 system sh/cfg.sh -n dnode4 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 3000 @@ -44,7 +44,7 @@ endi print ========== step2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show2: @@ -92,7 +92,7 @@ endi print ========== step3 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 show4: @@ -139,7 +139,7 @@ if $data2_3 != 3 then goto show5 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sql reset query cache sleep 1000 @@ -199,11 +199,11 @@ if $data41 != 35 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim index 43a55b6106fe25cfcaf6914eab4d34298c02753c..5382e88e536596682636496e9e3f66bc121b1561 100644 --- a/tests/script/unique/dnode/basic1.sim +++ b/tests/script/unique/dnode/basic1.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 -system sh/exec_up.sh -n dnode1 -s start -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode1 -s start +system sh/exec.sh -n dnode2 -s start sql connect print =============== show dnodes diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim index a20185240f351457dab37d47aa3066e063408976..519aae6ca9f64b14a4488889a1e3eb6ead884467 100644 --- a/tests/script/unique/dnode/monitor_bug.sim +++ b/tests/script/unique/dnode/monitor_bug.sim @@ -13,7 +13,7 @@ system sh/cfg.sh -n dnode1 -c monitor -v 1 system sh/cfg.sh -n dnode2 -c monitor -v 0 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 5000 @@ -25,7 +25,7 @@ endi print ========== step2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show2: diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index 9d068e835875d2f6cb5448d5b7947bde1420ffe6..02d03dee97be0f2de62b3f8eb18194c595e7b050 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -21,10 +21,10 @@ system sh/cfg.sh -n dnode2 -c wallevel -v 1 system sh/cfg.sh -n dnode3 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 sql show dnodes @@ -39,7 +39,7 @@ if $data4_2 != ready then endi print ========== step2 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 8000 sql show dnodes @@ -67,11 +67,11 @@ if $data4_2 != null then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index e9c1218e1f784974147934ebef43d0b2d22f3da8..6db6ca40137a75916ff1efe80396c64d03e6838c 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -21,10 +21,10 @@ system sh/cfg.sh -n dnode2 -c wallevel -v 1 system sh/cfg.sh -n dnode3 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 3000 sql create database d1 replica 2 maxTables 4 @@ -43,7 +43,7 @@ if $data4_2 != ready then endi print ========== step2 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 8000 sql show dnodes @@ -73,8 +73,8 @@ endi print ========== step4 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start sql drop dnode $hostname2 sleep 5000 @@ -109,11 +109,11 @@ if $rows != 1 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index 2eb1fe4ae73f5af2b6398caba462f1cd06efdf01..5c4d30e728ddb1bfc50dc437d9378b3f79555c5b 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -16,7 +16,7 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 1 system sh/cfg.sh -n dnode4 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -44,7 +44,7 @@ endi print ========== step2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 9000 sql create database d3 replica 2 maxTables 4 @@ -91,7 +91,7 @@ print dnode2 openVnodes $data2_2 print ========== step4 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 show4: @@ -109,11 +109,11 @@ if $data2_2 != null then goto show4 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step5 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 show5: @@ -195,11 +195,11 @@ if $data41 != 35 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index db77a8e05dfd41e96267c4f6a9b97233cdcf728f..76c5fbb08e34e516e4ea050fee2c2a7f140096cb 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -16,7 +16,7 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 2 system sh/cfg.sh -n dnode4 -c wallevel -v 2 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -44,7 +44,7 @@ endi print ========== step2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 9000 sql create database d3 replica 2 maxTables 4 @@ -74,7 +74,7 @@ if $data2_2 != 3 then endi print ========== step3 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sql drop dnode $hostname2 sleep 4000 @@ -84,7 +84,7 @@ print dnode2 openVnodes $data2_2 print ========== step4 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 @@ -97,7 +97,7 @@ if $data2_3 != 0 then endi print ============ step 4.1 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show4: @@ -146,11 +146,11 @@ if $data41 != 35 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index d42fbf4e2d594791234dad1df333d4d9567f7432..6ab63bd94f270aa7cdc878b5b5dff0daa376ac8e 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -16,7 +16,7 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 1 system sh/cfg.sh -n dnode4 -c wallevel -v 1 print ========== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create database d1 maxTables 4 @@ -35,7 +35,7 @@ endi print ========== step2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 show2: @@ -98,12 +98,12 @@ if $rows != 1 then goto show4 endi -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print ========== step5 sleep 2000 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 show5: @@ -143,7 +143,7 @@ endi print ========== step7 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 show7: @@ -222,7 +222,7 @@ if $data2_4 != 4 then goto show9 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT print ========== step10 sql select * from d1.t1 order by t desc @@ -297,11 +297,11 @@ if $data41 != 45 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim index 51307af00e6447d93060f0e9198a55f29c29dcc0..3a480b6ebed9c8021989f98af385780d54dbf946 100644 --- a/tests/script/unique/http/admin.sim +++ b/tests/script/unique/http/admin.sim @@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c http -v 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sleep 3000 @@ -179,11 +179,11 @@ print =============== step8 - monitor dbs # return -1 # endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index 4e126c4e6098bcc1fda0a47929197569e4a7b5c7..827f02bc1f0b6909d91ef5d0cdb01285674114e5 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c http -v 1 system sh/cfg.sh -n dnode1 -c wallevel -v 0 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -238,11 +238,11 @@ if $system_content != @{"status":"succ","head":["count(*)"],"data":[[8]],"rows": return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index fab26a31cd715394277fb5e7dd4baf93eb793d13..f2836fe470562dd6229a9db7f694c7cfe7826cb3 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -26,12 +26,12 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 2 system sh/cfg.sh -n dnode4 -c walLevel -v 2 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create database ir2db replica 2 days 7 sql use ir2db @@ -95,9 +95,9 @@ if $rows != 14 then endi print ================== dnode restart -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 5000 sql select * from tb; if $rows != 14 then @@ -162,9 +162,9 @@ if $rows != 35 then endi print ================= step10 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 5000 sql select * from tb; print $rows @@ -192,9 +192,9 @@ if $rows != 49 then endi print ================= step13 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 print ================= step14 @@ -213,20 +213,20 @@ if $rows != 52 then endi print ================= step15 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 5000 if $rows != 52 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 3939bc2e1be9c3c996e7f1fb2f5ed48e5ab9d27e..b4e4a2191e7bd0b6f846117dd3e011db76e23fa1 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -26,14 +26,14 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 2 system sh/cfg.sh -n dnode4 -c walLevel -v 2 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create database ir3db replica 3 days 7 @@ -98,9 +98,9 @@ if $rows != 14 then endi print ================== dnode restart -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 5000 sql select * from tb; if $rows != 14 then @@ -165,9 +165,9 @@ if $rows != 35 then endi print ================= step10 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 5000 sql select * from tb; print $rows @@ -195,9 +195,9 @@ if $rows != 49 then endi print ================= step13 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 print ================= step14 @@ -216,20 +216,20 @@ if $rows != 52 then endi print ================= step15 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 if $rows != 52 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index e306b1b02a9f2b21abbaad6ae2ec2db7e0f38b6d..08fe8d346a8d57006b552727d14292b4d559777d 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -20,7 +20,7 @@ if $data2_1 != master then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 $x = 0 @@ -46,7 +46,7 @@ sql_error drop dnode $hostname1 -x error1 print should not drop master print ============== step4 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode1 -s stop -x SIGINT sleep 2000 sql_error show mnodes print error of no master @@ -56,7 +56,7 @@ sql_error drop dnode $hostname1 print error of no master print ============== step6 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 2000 sql close sql connect @@ -80,7 +80,7 @@ if $data2_2 != slave then endi print ============== step7 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 5000 @@ -106,11 +106,11 @@ if $data3_3 != null then goto show7 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index 2a28f8daf98bd5ffa601858c31f250d8b2881094..7e60ab908b81dd0ad88e550b4b487123e8204b2d 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql show mnodes @@ -19,7 +19,7 @@ if $data2_1 != master then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 $x = 0 @@ -41,7 +41,7 @@ if $data2_2 != slave then endi print ============== step3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 8000 @@ -85,14 +85,14 @@ if $dnode3Role != slave then return -1 endi -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop print ============== step5 sleep 2000 sql create dnode $hostname2 system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 8000 sql show mnodes @@ -114,7 +114,7 @@ if $dnode3Role != slave then endi print ============== step6 -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop sleep 10000 sql_error show mnodes @@ -122,11 +122,11 @@ sql_error show mnodes print ============== step7 sql_error drop dnode $hostname1 -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim index c989faca818d6b67ca44fd294737edb830447ad1..a7bcc59ac0bfa6163d1e2fddfd3a817b102bfa3c 100644 --- a/tests/script/unique/mnode/mgmt24.sim +++ b/tests/script/unique/mnode/mgmt24.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql show mnodes @@ -19,7 +19,7 @@ if $data2_1 != master then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 $x = 0 @@ -41,7 +41,7 @@ if $data2_2 != slave then endi print ============== step3 -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop sleep 2000 sql_error show mnodes @@ -49,7 +49,7 @@ print ============== step4 sql_error drop dnode $hostname1 print ============== step5 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql_error create dnode $hostname1 sql close @@ -74,11 +74,11 @@ if $data2_2 != slave then goto step5 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index f955ac70c39a3ee185c94a7542d6166bcaacd0c9..9cca9c844806b138faf52186ffc3184d4876a1d6 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql show mnodes @@ -19,7 +19,7 @@ if $data2_1 != master then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 $x = 0 @@ -41,7 +41,7 @@ if $data2_2 != slave then endi print ============== step3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 6000 @@ -85,11 +85,11 @@ if $dnode3Role != slave then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index 170905195becf44f1e5029e7d54aa1e3f4532bf5..9b534cca06c89d3fa6f05ab82a88fb80514acac2 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql show mnodes @@ -19,7 +19,7 @@ if $data2_1 != master then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 $x = 0 @@ -41,7 +41,7 @@ if $data2_2 != slave then endi print ============== step3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 6000 @@ -87,11 +87,11 @@ if $dnode3Role != slave then endi print ============== step5 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 sleep 5000 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 sleep 6000 @@ -113,11 +113,11 @@ if $dnode3Role != slave then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index 4a1fbf00b672151fdb5e8f7055d947549c15c402..205e1b05d376991d72d1676262ed50c4203d3bf3 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql show mnodes @@ -26,7 +26,7 @@ if $data3_3 != null then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 sleep 8000 @@ -49,7 +49,7 @@ if $dnode3Role != null then endi print ============== step3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 8000 @@ -93,12 +93,12 @@ if $dnode3Role != slave then return -1 endi -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 3000 system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start print ============== step5 sql create dnode $hostname2 @@ -123,7 +123,7 @@ if $dnode3Role != slave then endi print ============== step6 -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop sleep 10000 sql show mnodes @@ -166,11 +166,11 @@ endi # return -1 #endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index ada5321f1b298fca33e36b674566c1794d8cb1c7..96e3133d762362cc47f656421dfab8470e37cb2e 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -11,7 +11,7 @@ system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -30,7 +30,7 @@ if $data3_3 != null then endi print ============== step2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 sleep 8000 @@ -58,7 +58,7 @@ if $dnode4Role != null then endi print ============== step3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sql create dnode $hostname3 sleep 8000 @@ -87,7 +87,7 @@ endi print ============== step4 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sql create dnode $hostname4 sleep 8000 @@ -141,12 +141,12 @@ if $dnode4Role != slave then return -1 endi -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 3000 system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start print ============== step6 sql create dnode $hostname2 @@ -176,7 +176,7 @@ if $dnode4Role != slave then endi print ============== step7 -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop sleep 4000 sql show mnodes @@ -220,11 +220,11 @@ endi # return -1 #endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim index 77e5e601bb6493688a42307c34df52f8906a151f..1fba912d492785900f88686097074eaafc4445af 100644 --- a/tests/script/unique/mnode/mgmtr2.sim +++ b/tests/script/unique/mnode/mgmtr2.sim @@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2 print ============== step1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect @@ -37,22 +37,22 @@ sql create dnode $hostname3 print ============== step3 print ========= start dnode2 and dnode3 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 1000 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 8000 -system sh/exec_up.sh -n dnode2 -s stop -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode2 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 4000 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 4000 -system sh/exec_up.sh -n dnode2 -s stop -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode2 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 4000 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start print ============== step4 sql show mnodes @@ -74,11 +74,11 @@ if $dnode3Role != null then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/balance_replica1.sim b/tests/script/unique/stable/balance_replica1.sim index 4269c2fc7f1d5b50bd423435c71363101830f105..35b5efe15402d52640d274081a78cc7a484e5fc1 100644 --- a/tests/script/unique/stable/balance_replica1.sim +++ b/tests/script/unique/stable/balance_replica1.sim @@ -23,7 +23,7 @@ $totalNum = 200 print ============== step1 print ========= start dnode1 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect $i = 0 @@ -78,7 +78,7 @@ if $dnode2Vnodes != null then endi print =============== step3 start dnode2 sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 8000 $x = 0 @@ -135,11 +135,11 @@ if $rows != 2600 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/dnode2.sim b/tests/script/unique/stable/dnode2.sim index 2d894c6542f9ff710680641b82a8a5464285d745..ce8079208255559c8325e327f02ed821b2cb81ac 100644 --- a/tests/script/unique/stable/dnode2.sim +++ b/tests/script/unique/stable/dnode2.sim @@ -7,12 +7,12 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 createDnode: @@ -194,11 +194,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/unique/stable/dnode2_stop.sim index 0cf13fa286b7ff332f609ed88fe3504347046642..0a801d9c7e9e6cb2af4eb013f0d7e8aecc76ff1c 100644 --- a/tests/script/unique/stable/dnode2_stop.sim +++ b/tests/script/unique/stable/dnode2_stop.sim @@ -7,11 +7,11 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 createDnode: @@ -73,7 +73,7 @@ endi sleep 100 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT print =============== step2 sql select count(*) from $mt -x step2 @@ -84,7 +84,7 @@ sql select count(tbcol) from $mt -x step21 return -1 step21: -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 10000 print =============== step3 @@ -147,11 +147,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/dnode3.sim b/tests/script/unique/stable/dnode3.sim index 8025b180d898014d16b2450a0acc4ff63eaf8162..714927c1bd8000218cace652f248392d219ac934 100644 --- a/tests/script/unique/stable/dnode3.sim +++ b/tests/script/unique/stable/dnode3.sim @@ -11,14 +11,14 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start $x = 0 createDnode: @@ -222,11 +222,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/replica2_dnode4.sim b/tests/script/unique/stable/replica2_dnode4.sim index b96535fccd4f89a1472964d5d22823c953102f46..b40d5d378b352994673e518304f51e47e4d31657 100644 --- a/tests/script/unique/stable/replica2_dnode4.sim +++ b/tests/script/unique/stable/replica2_dnode4.sim @@ -15,16 +15,16 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 createDnode: @@ -212,11 +212,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/replica2_vnode3.sim b/tests/script/unique/stable/replica2_vnode3.sim index c7882d7a960077c20b935b8a3e5c2dafb2610a7e..6acdec7394844303f977e635bc7e72de14263bef 100644 --- a/tests/script/unique/stable/replica2_vnode3.sim +++ b/tests/script/unique/stable/replica2_vnode3.sim @@ -7,11 +7,11 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start $x = 0 createDnode: @@ -191,11 +191,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/replica3_dnode6.sim b/tests/script/unique/stable/replica3_dnode6.sim index 0dc81999ca63b3c9551980fa84f451ee8d86c8ca..6ae6cbde2cfb41a733a116c434d6647e9ee89e11 100644 --- a/tests/script/unique/stable/replica3_dnode6.sim +++ b/tests/script/unique/stable/replica3_dnode6.sim @@ -27,7 +27,7 @@ system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode6 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 @@ -35,11 +35,11 @@ sql create dnode $hostname3 sql create dnode $hostname4 sql create dnode $hostname5 sql create dnode $hostname6 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode4 -s start -system sh/exec_up.sh -n dnode5 -s start -system sh/exec_up.sh -n dnode6 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode4 -s start +system sh/exec.sh -n dnode5 -s start +system sh/exec.sh -n dnode6 -s start $x = 0 createDnode: @@ -239,11 +239,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/stable/replica3_vnode3.sim b/tests/script/unique/stable/replica3_vnode3.sim index fe310aa0f7e5136db9517866b23c5a666674ce08..80372d25a544d4abc3dd33e9e0f1bfe11a958dfa 100644 --- a/tests/script/unique/stable/replica3_vnode3.sim +++ b/tests/script/unique/stable/replica3_vnode3.sim @@ -16,16 +16,16 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode4 -s start $x = 0 createDnode: $x = $x + 1 @@ -213,11 +213,11 @@ if $rows != 0 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim index 4b7fb8ffc47e9a8b669f6506458b21ad5267e3bf..bd07d5f171b5f2ce20a69441a1e3ef4c330bc6c8 100644 --- a/tests/script/unique/vnode/many.sim +++ b/tests/script/unique/vnode/many.sim @@ -20,13 +20,13 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ========= step1 @@ -57,22 +57,22 @@ run_back unique/vnode/back_insert_many.sim sleep 5000 print ======== step3 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 $x = 0 loop: print ======== step4 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 5000 print ======== step5 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 print ======== step6 @@ -113,11 +113,11 @@ if $x < 2 then goto loop endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim index 6468538ec629152223580ac9a9f350e1a1165ea2..5bd35159d5e67b381574cc7ddbc59da743f2a01d 100644 --- a/tests/script/unique/vnode/replica2_basic2.sim +++ b/tests/script/unique/vnode/replica2_basic2.sim @@ -26,13 +26,13 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 sql reset query cache @@ -130,7 +130,7 @@ if $rows != 2 then endi print ========= step3 -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 #sql insert into d1.t1 values(now, 3) @@ -159,9 +159,9 @@ if $rows != 2 then endi print ========= step4 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT sleep 5000 #sql insert into d1.t1 values(now, 4) @@ -190,7 +190,7 @@ if $rows != 2 then endi print ========= step5 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 sql insert into d1.t1 values(now, 5) @@ -218,11 +218,11 @@ if $rows != 3 then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim index 4b024bfc9cb0ea8e81cc9cb4afc3ada5de805390..73e71c149ec9c071dad542f12866f59ab5caf4a6 100644 --- a/tests/script/unique/vnode/replica2_repeat.sim +++ b/tests/script/unique/vnode/replica2_repeat.sim @@ -16,13 +16,13 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 print ========= step1 @@ -37,22 +37,22 @@ run_back unique/vnode/back_insert.sim sleep 3000 print ======== step3 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 $x = 0 loop: print ======== step4 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 5000 print ======== step5 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 print ======== step6 @@ -71,11 +71,11 @@ if $x < 2 then goto loop endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim index 288996548f851598f5451858980e2ea3bd0beac2..ab5bebb50daf8a3be63d039152a020f0fff7000b 100644 --- a/tests/script/unique/vnode/replica3_basic.sim +++ b/tests/script/unique/vnode/replica3_basic.sim @@ -10,12 +10,12 @@ system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 $N = 10 @@ -48,7 +48,7 @@ if $rows != $expect then endi print =================== step 3 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 2000 $y = $x + $N $expect = $N * 2 @@ -65,7 +65,7 @@ if $rows != $expect then endi print =================== step 4 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 2000 $y = $x + $N $expect = $N * 3 @@ -82,7 +82,7 @@ if $rows != $expect then endi print =================== step 5 -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 2000 $y = $x + $N $expect = $N * 4 @@ -99,7 +99,7 @@ if $rows != $expect then endi print =================== step 6 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 2000 $y = $x + $N $expect = $N * 5 @@ -116,7 +116,7 @@ return -1 endi print =================== step 7 -system sh/exec_up.sh -n dnode1 -s stop +system sh/exec.sh -n dnode1 -s stop sleep 2000 $y = $x + $N $expect = $N * 6 @@ -133,7 +133,7 @@ return -1 endi print =================== step 8 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sleep 2000 $y = $x + $N $expect = $N * 7 @@ -149,11 +149,11 @@ if $rows != $expect then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim index b184bf194caffe893aac06485ffcf8d57bf101de..9c3d5bbf09eeee35491228687112b67e2a2b0126 100644 --- a/tests/script/unique/vnode/replica3_repeat.sim +++ b/tests/script/unique/vnode/replica3_repeat.sim @@ -17,15 +17,15 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 sql create dnode $hostname4 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start +system sh/exec.sh -n dnode4 -s start sleep 3000 print ========= step1 @@ -40,28 +40,28 @@ run_back unique/vnode/back_insert.sim sleep 3000 print ======== step3 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 $x = 0 loop: print ======== step4 -system sh/exec_up.sh -n dnode2 -s start +system sh/exec.sh -n dnode2 -s start sleep 5000 -system sh/exec_up.sh -n dnode3 -s stop +system sh/exec.sh -n dnode3 -s stop sleep 5000 print ======== step5 -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode3 -s start sleep 5000 -system sh/exec_up.sh -n dnode4 -s stop +system sh/exec.sh -n dnode4 -s stop sleep 5000 print ======== step6 -system sh/exec_up.sh -n dnode4 -s start +system sh/exec.sh -n dnode4 -s start sleep 5000 -system sh/exec_up.sh -n dnode2 -s stop +system sh/exec.sh -n dnode2 -s stop sleep 5000 print ======== step7 @@ -80,11 +80,11 @@ if $x < 2 then goto loop endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index beb0667d08a8399fc9870650faaa57ccaafb2a6e..09ca261a061d8551c5c2bf286743a86051ec1d23 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -10,12 +10,12 @@ system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3 -system sh/exec_up.sh -n dnode1 -s start +system sh/exec.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec_up.sh -n dnode2 -s start -system sh/exec_up.sh -n dnode3 -s start +system sh/exec.sh -n dnode2 -s start +system sh/exec.sh -n dnode3 -s start sleep 3000 $N = 10 @@ -61,11 +61,11 @@ if $rows != $expect then return -1 endi -system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec.sh -n dnode6 -s stop -x SIGINT +system sh/exec.sh -n dnode7 -s stop -x SIGINT +system sh/exec.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file