From 7f550eb660c63478c84842217090742607750a70 Mon Sep 17 00:00:00 2001 From: slguan Date: Mon, 4 May 2020 21:18:24 +0800 Subject: [PATCH] scripts --- tests/script/sh/deploy.sh | 1 + tests/script/unique/account/pass_alter.sim | 1 + tests/script/unique/account/testSuite.sim | 2 +- tests/script/unique/cluster/balance1.sim | 516 +++++------------- tests/script/unique/cluster/balance1_bug.sim | 196 +++---- .../script/unique/cluster/balance1_single.sim | 120 ++-- tests/script/unique/cluster/balance2.sim | 214 ++++---- tests/script/unique/cluster/balance3.sim | 138 ++--- tests/script/unique/cluster/testSuite.sim | 10 +- tests/script/unique/column/testSuite.sim | 2 +- tests/script/unique/http/admin.sim | 5 +- tests/script/unique/http/opentsdb.sim | 5 +- tests/script/unique/import/replica2.sim | 23 +- tests/script/unique/import/replica3.sim | 25 +- tests/script/unique/import/testSuite.sim | 4 +- tests/script/unique/table/testSuite.sim | 2 +- tests/script/unique/vnode/commit.sim | 21 +- tests/script/unique/vnode/many.sim | 27 +- tests/script/unique/vnode/replica2_basic.sim | 20 +- tests/script/unique/vnode/replica2_basic2.sim | 88 ++- tests/script/unique/vnode/replica2_repeat.sim | 27 +- tests/script/unique/vnode/replica3_basic.sim | 32 +- tests/script/unique/vnode/replica3_repeat.sim | 33 +- tests/script/unique/vnode/replica3_vgroup.sim | 14 +- tests/script/unique/vnode/testSuite.sim | 12 +- 25 files changed, 636 insertions(+), 902 deletions(-) diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 81e955ccfb..bfbba3a012 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -106,6 +106,7 @@ echo "httpDebugFlag 135" >> $TAOS_CFG echo "monitorDebugFlag 131" >> $TAOS_CFG echo "udebugFlag 131" >> $TAOS_CFG echo "jnidebugFlag 131" >> $TAOS_CFG +echo "sdebugFlag 135" >> $TAOS_CFG echo "monitor 0" >> $TAOS_CFG echo "http 0" >> $TAOS_CFG echo "numOfThreadsPerCore 2.0" >> $TAOS_CFG diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index 2c15d55544..54ab8fbda8 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -43,6 +43,7 @@ step3: print ============= step4 sql close +sleep 1000 sql connect sleep 2000 sql create account oroot pass 'taosdata' diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim index 9d4141cfe0..38856196c2 100644 --- a/tests/script/unique/account/testSuite.sim +++ b/tests/script/unique/account/testSuite.sim @@ -4,7 +4,7 @@ run unique/account/account_len.sim run unique/account/authority.sim run unique/account/basic.sim run unique/account/paras.sim -run unique/account/pass_alter.sim +#run unique/account/pass_alter.sim run unique/account/pass_len.sim run unique/account/usage.sim run unique/account/user_create.sim diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index fe090ff3ca..5c34358e58 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -3,30 +3,50 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode4 -i 4 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 +system sh/deploy.sh -n dnode5 -i 5 +system sh/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 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/cfg.sh -n dnode1 -c clog -v 1 -system sh/cfg.sh -n dnode2 -c clog -v 1 -system sh/cfg.sh -n dnode3 -c clog -v 1 -system sh/cfg.sh -n dnode4 -c clog -v 1 +system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 +system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 +system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 +system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4 + +system sh/cfg.sh -n dnode1 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode2 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode3 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode4 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode5 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode6 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode7 -c numOfMpeers -v 3 +system sh/cfg.sh -n dnode8 -c numOfMpeers -v 3 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0 +system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 0 +system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0 +system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0 +system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0 + +system sh/cfg.sh -n dnode1 -c clog -v 1 +system sh/cfg.sh -n dnode2 -c clog -v 1 +system sh/cfg.sh -n dnode3 -c clog -v 1 +system sh/cfg.sh -n dnode4 -c clog -v 1 +system sh/cfg.sh -n dnode5 -c clog -v 1 +system sh/cfg.sh -n dnode6 -c clog -v 1 +system sh/cfg.sh -n dnode7 -c clog -v 1 +system sh/cfg.sh -n dnode8 -c clog -v 1 print ============== step1 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create database c_b1_d1 tables 4 @@ -49,9 +69,9 @@ sql insert into c_b1_t2 values(1520000023022, 22) sql insert into c_b1_t2 values(1520000024021, 21) sql show dnodes -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then @@ -65,7 +85,7 @@ print ============================== step2 print ========= start dnode2 sleep 2000 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 5000 $x = 0 @@ -76,27 +96,23 @@ show2: return -1 endi sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -if $dnode1Vnodes != 3 then +if $dnode1Vnodes != 1 then goto show2 endi -if $dnode2Vnodes != 3 then +if $dnode2Vnodes != 1 then goto show2 endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -122,12 +138,12 @@ show4: return -1 endi sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -if $dnode1Vnodes != 1 then +if $dnode1Vnodes != 3 then goto show4 endi if $dnode2Vnodes != null then @@ -135,10 +151,10 @@ if $dnode2Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -146,16 +162,10 @@ print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 -system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c clog -v 1 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 3000 -system sh/exec.sh -n dnode2 -s start -sql create dnode $hostname2 +system sh/exec_up.sh -n dnode3 -s start +sql create dnode $hostname3 sleep 9000 $x = 0 @@ -166,119 +176,42 @@ show5: return -1 endi sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes +$dnode3Vnodes = $data2_3 +print dnode2 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show5 endi -if $dnode2Vnodes != 3 then +if $dnode3Vnodes != 1 then goto show5 endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -print ============================== step6 -print ========= drop dnode1 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -print stop dnode1 and sleep 10000 -sleep 10000 - -sql drop dnode $hostname1 -print drop dnode1 and sleep 9000 -sleep 9000 - -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 30 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes - -if $dnode1Vnodes != null then - goto show6 +if $dnode1Role != master then + return -1 endi -if $dnode2Vnodes != 1 then - goto show6 +if $dnode3Role != slave then + return -1 endi -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role +print ============================== step6 +sql_error drop dnode $hostname1 print ============================== step7 -print ========= add dnode1 -sql create dnode $hostname1 -sleep 3000 -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c clog -v 1 -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 -sleep 23000 -system sh/exec.sh -n dnode1 -s start -sleep 14000 - -$x = 0 -show7: - $x = $x + 1 - sleep 2000 - if $x == 20 then - return -1 - endi -sql show dnodes -x show7 -$dnode1Vnodes = $data3_192.168.0.1 -print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes - -if $dnode1Vnodes != 3 then - goto show7 -endi -if $dnode2Vnodes != 2 then - goto show7 -endi - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role +sql_error create dnode $hostname1 print ============================== step8 -print ========= drop dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -print stop dnode2 and sleep 10000 -sleep 20000 -sql drop dnode $hostname2 -print drop dnode2 and sleep 9000 -sleep 19000 +sql drop dnode $hostname3 +sleep 15000 $x = 0 show8: @@ -288,25 +221,23 @@ show8: return -1 endi sql show dnodes -x show8 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes +$dnode3Vnodes = $data2_3 +print dnode3 $dnode3Vnodes -if $dnode1Vnodes != 1 then +if $dnode1Vnodes != 3 then goto show8 endi -if $dnode2Vnodes != null then +if $dnode3Vnodes != null then goto show8 endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role @@ -314,16 +245,13 @@ if $dnode1Role != master then return -1 endi +if $dnode3Role != null then + return -1 +endi + print ============================== step9 -print ========= add dnode2 -sql create dnode $hostname2 -system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c clog -v 1 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 -sleep 3000 -system sh/exec.sh -n dnode2 -s start +sql create dnode $hostname4 +system sh/exec_up.sh -n dnode4 -s start sleep 9000 $x = 0 @@ -334,30 +262,33 @@ show9: return -1 endi sql show dnodes -x show9 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes +$dnode4Vnodes = $data2_4 +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show9 endi -if $dnode2Vnodes != 3 then +if $dnode4Vnodes != 1 then goto show9 endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role +if $dnode1Role != master then + return -1 +endi + +if $dnode4Role != slave then + return -1 +endi + print ============================== step10 -print ========= add db4 sql create database c_b1_d4 tables 4 sql use c_b1_d4 sql create table c_b1_t4 (t timestamp, i int) @@ -375,102 +306,43 @@ show10: return -1 endi sql show dnodes -x show10 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes +$dnode4Vnodes = $data2_4 +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 endi -if $dnode2Vnodes != 2 then +if $dnode4Vnodes != 2 then goto show10 endi +sql reset query cache + sql use c_b1_d3 sql insert into c_b1_t3 values(1520000025036, 36) sql use c_b1_d2 sql insert into c_b1_t2 values(1520000025026, 26) -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role - -if $dnode1Role != master then - return -1 -endi - -print ============================== step11 -print ========= drop dnode2 -sleep 2000 -sql drop dnode $hostname2 -sleep 9000 - -$x = 0 -show11: - $x = $x + 1 - sleep 2000 - if $x == 20 then - return -1 - endi -sql show dnodes -x show11 -$dnode1Vnodes = $data3_192.168.0.1 -print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes - -if $dnode1Vnodes != 0 then - goto show11 -endi -if $dnode2Vnodes != null then - goto show11 -endi - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role - -system sh/exec.sh -n dnode2 -s stop -x SIGINT - print ============================== step12 -print ========= add db5 sql create database c_b1_d5 tables 4 sql use c_b1_d5 -sql create table c_b1_t5 (t timestamp, i int) -x error3 -print no enough vnodes, but create success -return -1 -error3: +sql_error create table c_b1_t5 (t timestamp, i int) -x error3 print ============================== step13 -print ========= add dnode2 -sql create dnode $hostname2 -system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c clog -v 1 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 -sleep 3000 -system sh/exec.sh -n dnode2 -s start +sql create dnode $hostname5 +system sh/exec_up.sh -n dnode5 -s start sleep 9000 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode4Role = $data2_4 +$dnode5Role = $data2_5 print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role +print dnode5 ==> $dnode5Role sql use c_b1_d5; sql create table c_b1_t5 (t timestamp, i int) @@ -490,71 +362,27 @@ sql insert into c_b1_t6 values(1520000023062, 62) sql insert into c_b1_t6 values(1520000024061, 61) sql show dnodes -$dnode1Vnodes = $data3_192.168.0.1 -print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes - -#if $dnode1Vnodes != 1 then -# return -1 -#endi -#if $dnode2Vnodes != 1 then -# return -1 -#endi - -print ============================== step14 -print ========= add dnode3 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role - -sleep 2000 -sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start -sleep 15000 - -$x = 0 -show14: - $x = $x + 1 - sleep 2000 - if $x == 30 then - return -1 - endi -sql show dnodes -x show14 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print dnode3 $dnode3Vnodes +$dnode4Vnodes = $data2_4 +print dnode4 $dnode2Vnodes +$dnode5Vnodes = $data2_5 +print dnode5 $dnode2Vnodes if $dnode1Vnodes != 2 then - goto show14 + return -1 endi -if $dnode2Vnodes != 2 then - goto show14 +if $dnode4Vnodes != 2 then + return -1 endi -if $dnode3Vnodes != 2 then - goto show14 +if $dnode5Vnodes != 2 then + return -1 endi -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role - -print ============================== step15 -print ========= create db7 db8 +print ============================== step14 +sql create dnode $hostname6 +system sh/exec_up.sh -n dnode6 -s start +sleep 15000 sql create database c_b1_d7 tables 4 sql use c_b1_d7 @@ -574,96 +402,39 @@ sql insert into c_b1_t8 values(1520000022083, 83) sql insert into c_b1_t8 values(1520000023082, 82) sql insert into c_b1_t8 values(1520000024081, 81) -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print dnode1 ==> $dnode1Role -print dnode2 ==> $dnode2Role -print dnode3 ==> $dnode3Role -print dnode4 ==> $dnode4Role - -print ========== add dnode4 -sleep 2000 -sql create dnode $hostname4 -print sql create dnode $hostname4 over -system sh/exec.sh -n dnode4 -s start -print sleep 12000 -sleep 12000 -print sleep 12000 over - $x = 0 -show15: +show14: $x = $x + 1 sleep 2000 - if $x == 15 then + if $x == 30 then return -1 endi -sql show dnodes -x show15 -$dnode1Vnodes = $data3_192.168.0.1 +sql show dnodes -x show14 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes +$dnode5Vnodes = $data2_5 +print dnode5 $dnode5Vnodes +$dnode6Vnodes = $data2_6 +print dnode6 $dnode6Vnodes if $dnode1Vnodes != 2 then - goto show15 -endi -if $dnode2Vnodes != 2 then - goto show15 -endi -if $dnode3Vnodes != 2 then - goto show15 + goto show14 endi if $dnode4Vnodes != 2 then - goto show15 -endi - -print ============================== step16 -print ========= drop dnode4, create db9 - -sql drop dnode $hostname4 -sleep 10000 -sql create database c_b1_d9 tables 4 -sql use c_b1_d9 -sql create table c_b1_t9 (t timestamp, i int) -sql insert into c_b1_t9 values(1520000020095, 95) -sql insert into c_b1_t9 values(1520000021094, 94) -sql insert into c_b1_t9 values(1520000022093, 93) -sql insert into c_b1_t9 values(1520000023092, 92) -sql insert into c_b1_t9 values(1520000024091, 91) - -system sh/exec.sh -n dnode4 -s stop -x SIGINT - -$x = 0 -show16: - $x = $x + 1 - sleep 2000 - if $x == 30 then - return -1 - endi -sql show dnodes -x show16 -$dnode1Vnodes = $data3_192.168.0.1 -print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print dnode3 $dnode3Vnodes - -if $dnode1Vnodes != 1 then - goto show16 + goto show14 endi -if $dnode2Vnodes != 1 then - goto show16 +if $dnode5Vnodes != 2 then + goto show14 endi -if $dnode3Vnodes != 1 then - goto show16 +if $dnode6Vnodes != 2 then + goto show14 endi +sql reset query cache +sleep 1000 + print ============================== step17 print ========= check data @@ -788,12 +559,11 @@ if $data41 != 95 then return -1 endi - print ============================================ over -#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_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 diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim index b1247f5ea7..d9f903d55e 100644 --- a/tests/script/unique/cluster/balance1_bug.sim +++ b/tests/script/unique/cluster/balance1_bug.sim @@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0 print ============== step1 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create database c_b1_d1 tables 4 @@ -49,9 +49,9 @@ sql insert into c_b1_t2 values(now+4s, 22) sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then @@ -65,7 +65,7 @@ print ============================== step2 print ========= start dnode2 sleep 2000 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 5000 $x = 0 @@ -76,9 +76,9 @@ show2: return -1 endi sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then @@ -89,10 +89,10 @@ if $dnode2Vnodes != 3 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -122,9 +122,9 @@ show4: return -1 endi sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then @@ -135,10 +135,10 @@ if $dnode2Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -146,9 +146,9 @@ print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode $hostname2 sleep 9000 @@ -160,9 +160,9 @@ show5: return -1 endi sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then @@ -173,10 +173,10 @@ if $dnode2Vnodes != 3 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -184,7 +184,7 @@ print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT print stop dnode1 and sleep 10000 sleep 10000 @@ -200,9 +200,9 @@ show6: return -1 endi sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then @@ -213,10 +213,10 @@ if $dnode2Vnodes != 1 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -226,7 +226,7 @@ print ============================== step7 print ========= add dnode1 sql create dnode $hostname1 sleep 23000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 14000 $x = 0 @@ -237,9 +237,9 @@ show7: return -1 endi sql show dnodes -x show7 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then @@ -250,10 +250,10 @@ if $dnode2Vnodes != 2 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -261,7 +261,7 @@ print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print stop dnode2 and sleep 10000 sleep 20000 sql drop dnode $hostname2 @@ -276,9 +276,9 @@ show8: return -1 endi sql show dnodes -x show8 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then @@ -289,10 +289,10 @@ if $dnode2Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -305,7 +305,7 @@ endi print ============================== step9 print ========= add dnode2 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 9000 $x = 0 @@ -316,9 +316,9 @@ show9: return -1 endi sql show dnodes -x show9 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then @@ -329,10 +329,10 @@ if $dnode2Vnodes != 3 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -357,9 +357,9 @@ show10: return -1 endi sql show dnodes -x show10 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then @@ -376,8 +376,8 @@ sql use c_b1_d2 sql insert into c_b1_t2 values(now+1s, 25) sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role @@ -399,9 +399,9 @@ show11: return -1 endi sql show dnodes -x show11 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then @@ -412,16 +412,16 @@ if $dnode2Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ============================== step12 print ========= add db5 @@ -435,14 +435,14 @@ error3: print ============================== step13 print ========= add dnode2 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 9000 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -480,9 +480,9 @@ sql insert into c_b1_t6 values(now+4s, 62) sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then @@ -496,10 +496,10 @@ print ============================== step14 print ========= add dnode3 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -507,7 +507,7 @@ print dnode4 ==> $dnode4Role sleep 2000 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 15000 $x = 0 @@ -518,11 +518,11 @@ show14: return -1 endi sql show dnodes -x show14 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then @@ -536,9 +536,9 @@ if $dnode3Vnodes != 2 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -565,10 +565,10 @@ sql insert into c_b1_t8 values(now+4s, 82) sql insert into c_b1_t8 values(now+5s, 81) sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -578,7 +578,7 @@ print ========== add dnode4 sleep 2000 sql create dnode $hostname4 print sql create dnode $hostname4 over -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start print sleep 12000 sleep 12000 print sleep 12000 over @@ -591,13 +591,13 @@ show15: return -1 endi sql show dnodes -x show15 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then @@ -627,7 +627,7 @@ sql insert into c_b1_t9 values(now+3s, 93) sql insert into c_b1_t9 values(now+4s, 92) sql insert into c_b1_t9 values(now+5s, 91) -system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec_up.sh -n dnode4 -s stop -x SIGINT $x = 0 show16: @@ -637,11 +637,11 @@ show16: return -1 endi sql show dnodes -x show16 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then @@ -780,10 +780,10 @@ endi s8: print ============================================ over -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_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 diff --git a/tests/script/unique/cluster/balance1_single.sim b/tests/script/unique/cluster/balance1_single.sim index f4a400318b..be46186a59 100644 --- a/tests/script/unique/cluster/balance1_single.sim +++ b/tests/script/unique/cluster/balance1_single.sim @@ -31,11 +31,11 @@ system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 print ============== step1 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start $x = 0 show1: @@ -45,9 +45,9 @@ show1: return -1 endi sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode2Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode3Vnodes if $dnode1Vnodes != 4 then @@ -78,9 +78,9 @@ sql insert into c_b1_t2 values(now+4s, 22) sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then @@ -94,7 +94,7 @@ print ============================== step2 print ========= start dnode3 sleep 3000 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 8000 $x = 0 @@ -105,9 +105,9 @@ show2: return -1 endi sql show dnodes -x show2 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then @@ -118,10 +118,10 @@ if $dnode3Vnodes != 3 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -152,9 +152,9 @@ show4: return -1 endi sql show dnodes -x show4 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then @@ -165,10 +165,10 @@ if $dnode3Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -176,9 +176,9 @@ print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode3 -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sql create dnode $hostname3 sleep 9000 @@ -190,9 +190,9 @@ show5: return -1 endi sql show dnodes -x show5 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then @@ -204,7 +204,7 @@ endi print ============================== step6 print ========= drop dnode2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print stop dnode2 and sleep 10000 sleep 10000 @@ -220,9 +220,9 @@ show6: return -1 endi sql show dnodes -x show6 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != null then @@ -237,7 +237,7 @@ endi print ============================== step7 print ========= add dnode2 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 9000 $x = 0 @@ -248,9 +248,9 @@ show7: return -1 endi sql show dnodes -x show7 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then @@ -262,7 +262,7 @@ endi print ============================== step8 print ========= drop dnode3 -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT print stop dnode3 and sleep 10000 sleep 10000 sql drop dnode $hostname3 @@ -277,9 +277,9 @@ show8: return -1 endi sql show dnodes -x show8 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then @@ -292,7 +292,7 @@ endi print ============================== step9 print ========= add dnode3 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 9000 $x = 0 @@ -303,9 +303,9 @@ show9: return -1 endi sql show dnodes -x show9 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then @@ -334,9 +334,9 @@ show10: return -1 endi sql show dnodes -x show10 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then @@ -365,9 +365,9 @@ show11: return -1 endi sql show dnodes -x show11 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode2Vnodes != 0 then @@ -377,7 +377,7 @@ if $dnode3Vnodes != null then goto show11 endi -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT print ============================== step12 print ========= add db5 @@ -387,7 +387,7 @@ sql use c_b1_d5 print ============================== step13 print ========= add dnode3 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 9000 sql use c_b1_d5; @@ -422,9 +422,9 @@ sql insert into c_b1_t6 values(now+4s, 62) sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes #if $dnode2Vnodes != 1 then @@ -437,7 +437,7 @@ print dnode3 $dnode3Vnodes print ============================== step14 print ========= add dnode4 sql create dnode $hostname4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 10000 $x = 0 @@ -448,11 +448,11 @@ show14: return -1 endi sql show dnodes -x show14 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then @@ -490,7 +490,7 @@ sql insert into c_b1_t8 values(now+5s, 81) print ========== add dnode5 sql create dnode $hostname5 print sql create dnode $hostname5 over -system sh/exec.sh -n dnode5 -s start +system sh/exec_up.sh -n dnode5 -s start print sleep 12000 sleep 12000 print sleep 12000 over @@ -503,13 +503,13 @@ show15: return -1 endi sql show dnodes -x show15 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 +$dnode5Vnodes = $data2_5 print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then @@ -539,7 +539,7 @@ sql insert into c_b1_t9 values(now+3s, 93) sql insert into c_b1_t9 values(now+4s, 92) sql insert into c_b1_t9 values(now+5s, 91) -system sh/exec.sh -n dnode5 -s stop -x SIGINT +system sh/exec_up.sh -n dnode5 -s stop -x SIGINT $x = 0 show16: @@ -549,11 +549,11 @@ show16: return -1 endi sql show dnodes -x show16 -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode2Vnodes != 1 then @@ -707,10 +707,10 @@ endi print ============================================ over -#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_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 diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 98ee962839..907b344140 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 mgmtEqualVnodeNum -v 0 print ============== step1 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sleep 4001 sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 4001 sql create database c_b2_d1 replica 2 tables 4 @@ -91,11 +91,11 @@ show1: return -1 endi sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then @@ -121,11 +121,11 @@ show2: return -1 endi sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then @@ -139,16 +139,16 @@ if $dnode3Vnodes != 1 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ============================== step3 print ========= start dnode2 @@ -162,7 +162,7 @@ system sh/cfg.sh -n dnode2 -c clog -v 1 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 sleep 3000 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 10000 $x = 0 @@ -173,11 +173,11 @@ show3: return -1 endi sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then @@ -191,10 +191,10 @@ if $dnode3Vnodes != 2 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -213,11 +213,11 @@ show4: return -1 endi sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then @@ -231,16 +231,16 @@ if $dnode3Vnodes != null then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT print ============================== step5 print ========= start dnode3 @@ -254,7 +254,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0 sleep 3000 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 9000 $x = 0 @@ -265,11 +265,11 @@ show5: return -1 endi sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then @@ -283,10 +283,10 @@ if $dnode3Vnodes != 2 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -294,7 +294,7 @@ print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT print stop dnode1 and sleep 10000 sleep 10000 @@ -310,11 +310,11 @@ show6: return -1 endi sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != null then @@ -328,10 +328,10 @@ if $dnode3Vnodes != 1 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -342,10 +342,10 @@ print ========= start dnode1 sql create dnode $hostname1 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -359,17 +359,17 @@ system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 sleep 3000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 9000 $x = 0 show7: sql show mnodes - $dnode1Role = $data3_192.168.0.1 - $dnode2Role = $data3_192.168.0.2 - $dnode3Role = $data3_192.168.0.3 - $dnode4Role = $data3_192.168.0.4 + $dnode1Role = $data2_1 + $dnode2Role = $data2_2 + $dnode3Role = $data2_3 + $dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -381,11 +381,11 @@ show7: return -1 endi sql show dnodes -x show7 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then @@ -411,14 +411,14 @@ sql insert into c_b2_t4 values(1520000023042, 42) sql insert into c_b2_t4 values(1520000024041, 41) sql create dnode $hostname4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 9000 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -432,13 +432,13 @@ show8: return -1 endi sql show dnodes -x show8 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then @@ -461,10 +461,10 @@ sql drop dnode $hostname4 sleep 10000 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -478,13 +478,13 @@ show9: return -1 endi sql show dnodes -x show9 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then @@ -500,8 +500,8 @@ if $dnode4Vnodes != null then goto show9 endi -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode4 -s stop -x SIGINT print ============================== step10 print ========= start dnode1.4 @@ -524,17 +524,17 @@ system sh/cfg.sh -n dnode4 -c clog -v 1 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0 sleep 3000 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 10000 $x = 0 show10: sql show mnodes - $dnode1Role = $data3_192.168.0.1 - $dnode2Role = $data3_192.168.0.2 - $dnode3Role = $data3_192.168.0.3 - $dnode4Role = $data3_192.168.0.4 + $dnode1Role = $data2_1 + $dnode2Role = $data2_2 + $dnode3Role = $data2_3 + $dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -546,13 +546,13 @@ show10: return -1 endi sql show dnodes -x show10 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then @@ -571,10 +571,10 @@ endi print ============================== step11 sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -606,13 +606,13 @@ show11: return -1 endi sql show dnodes -x show11 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -629,10 +629,10 @@ if $dnode4Vnodes != 1 then endi sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 +$dnode1Role = $data2_1 +$dnode2Role = $data2_2 +$dnode3Role = $data2_3 +$dnode4Role = $data2_4 print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role @@ -758,13 +758,13 @@ endi print ============================================ over -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 +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 diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index ad9631a88f..76ea380e8e 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -56,14 +56,14 @@ system sh/cfg.sh -n dnode8 -c clog -v 1 print ============== step1 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sleep 2001 sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3001 sql create database c_b3_d1 replica 3 @@ -101,13 +101,13 @@ show1: return -1 endi sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -126,7 +126,7 @@ endi print ============================== step2 print ========= start dnode4 sql create dnode $hostname4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 9000 $x = 0 @@ -137,13 +137,13 @@ show2: return -1 endi sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then @@ -163,13 +163,13 @@ show3: return -1 endi sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -185,7 +185,7 @@ if $dnode4Vnodes != 1 then goto show3 endi -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ============================== step4 print ========= start dnode2 @@ -197,7 +197,7 @@ system sh/cfg.sh -n dnode2 -c clog -v 1 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 sleep 3000 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 10000 $x = 0 @@ -208,13 +208,13 @@ show4: return -1 endi sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then @@ -234,13 +234,13 @@ show5: return -1 endi sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -257,7 +257,7 @@ if $dnode4Vnodes != 1 then endi -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT print ============================== step6 print ========= start dnode3 @@ -269,7 +269,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0 sleep 3000 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 9000 $x = 0 @@ -280,13 +280,13 @@ show6: return -1 endi sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode3Vnodes != 2 then @@ -306,13 +306,13 @@ show7: return -1 endi sql show dnodes -x show7 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -328,7 +328,7 @@ if $dnode4Vnodes != null then goto show7 endi -system sh/exec.sh -n dnode4 -s stop -x SIGINT +system sh/exec_up.sh -n dnode4 -s stop -x SIGINT print ============================== step8 print ========= start dnode4 @@ -340,7 +340,7 @@ system sh/cfg.sh -n dnode4 -c clog -v 1 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0 sleep 3000 sql create dnode $hostname4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 9000 $x = 0 @@ -351,13 +351,13 @@ show8: return -1 endi sql show dnodes -x show8 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then @@ -366,7 +366,7 @@ endi print ============================== step9 print ========= drop dnode1 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT print stop dnode1 and sleep 10000 sleep 10000 @@ -382,13 +382,13 @@ show9: return -1 endi sql show dnodes -x show9 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then @@ -414,7 +414,7 @@ system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 sleep 3000 sql create dnode $hostname1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 9000 $x = 0 @@ -425,13 +425,13 @@ show10: return -1 endi sql show dnodes -x show10 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then @@ -466,13 +466,13 @@ show11: return -1 endi sql show dnodes -x show11 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then @@ -501,13 +501,13 @@ show12: return -1 endi sql show dnodes -x show12 -$dnode1Vnodes = $data3_192.168.0.1 +$dnode1Vnodes = $data2_1 print dnode1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 +$dnode2Vnodes = $data2_2 print dnode2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 +$dnode3Vnodes = $data2_3 print dnode3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 +$dnode4Vnodes = $data2_4 print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then @@ -523,7 +523,7 @@ if $dnode4Vnodes != 0 then goto show12 endi -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT print ============================== step13 print ========= check data @@ -607,13 +607,13 @@ endi print ============================================ over -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 +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 diff --git a/tests/script/unique/cluster/testSuite.sim b/tests/script/unique/cluster/testSuite.sim index b3e567cc9b..74fa2cb271 100644 --- a/tests/script/unique/cluster/testSuite.sim +++ b/tests/script/unique/cluster/testSuite.sim @@ -1,5 +1,5 @@ -#run unique/unique/balance1.sim -#run unique/unique/balance2.sim -#run unique/unique/balance3.sim -#run unique/unique/balance1_bug.sim -#run unique/unique/balance1_single.sim \ No newline at end of file +run unique/cluster/balance1.sim +run unique/cluster/balance2.sim +run unique/cluster/balance3.sim +run unique/cluster/balance1_bug.sim +run unique/cluster/balance1_single.sim \ No newline at end of file diff --git a/tests/script/unique/column/testSuite.sim b/tests/script/unique/column/testSuite.sim index d1e1f96d23..8663e9f305 100644 --- a/tests/script/unique/column/testSuite.sim +++ b/tests/script/unique/column/testSuite.sim @@ -1 +1 @@ -#run unique/column/replica3.sim +run unique/column/replica3.sim diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim index e1237617a8..bf4a9ffbac 100644 --- a/tests/script/unique/http/admin.sim +++ b/tests/script/unique/http/admin.sim @@ -1,11 +1,10 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -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.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sleep 3000 diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index 36fba4c24e..3c59a73454 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -1,9 +1,8 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/exec.sh -n dnode1 -s start +system sh/cfg.sh -n dnode1 -c clog -v 0 +system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index 470206942b..52afbd93cb 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -1,10 +1,5 @@ system sh/stop_dnodes.sh - - - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 @@ -31,12 +26,12 @@ system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create database ir2db replica 2 days 7 sql use ir2db @@ -95,9 +90,9 @@ if $rows != 11 then endi print ================== dnode restart -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 5000 sql select * from tb; if $rows != 11 then @@ -158,9 +153,9 @@ if $rows != 29 then endi print ================= step10 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 5000 sql select * from tb; if $rows != 29 then @@ -186,7 +181,7 @@ if $rows != 43 then endi print ================= step13 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 print ================= step14 @@ -205,9 +200,9 @@ if $rows != 46 then endi print ================= step15 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 8000 -system sh/exec.sh -n dnode1 -s stop +system sh/exec_up.sh -n dnode1 -s stop sleep 10000 if $rows != 46 then diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 2d07f8ce65..8b8602df66 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -1,10 +1,5 @@ system sh/stop_dnodes.sh - - - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 @@ -31,14 +26,14 @@ system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 5000 sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sql create database ir3db replica 3 days 7 @@ -97,9 +92,9 @@ if $rows != 11 then endi #print ================== dnode restart -#system sh/exec.sh -n dnode1 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT #sleep 5000 -#system sh/exec.sh -n dnode1 -s start +#system sh/exec_up.sh -n dnode1 -s start #sleep 5000 #sql select * from tb; #if $rows != 11 then @@ -146,9 +141,9 @@ if $rows != 29 then endi print ================= step10 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 5000 sql select * from tb; if $rows != 29 then @@ -170,7 +165,7 @@ if $rows != 43 then endi print ================= step13 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 print ================= step14 @@ -183,9 +178,9 @@ if $rows != 46 then endi print ================= step15 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 8000 -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode3 -s stop sleep 3000 if $rows != 46 then diff --git a/tests/script/unique/import/testSuite.sim b/tests/script/unique/import/testSuite.sim index 8be358ce17..df87ebf1be 100644 --- a/tests/script/unique/import/testSuite.sim +++ b/tests/script/unique/import/testSuite.sim @@ -1,2 +1,2 @@ -run unique/import/replica2.sim -run unique/import/replica3.sim \ No newline at end of file +#run unique/import/replica2.sim +#run unique/import/replica3.sim \ No newline at end of file diff --git a/tests/script/unique/table/testSuite.sim b/tests/script/unique/table/testSuite.sim index e0c0a1f2fa..373f358ac8 100644 --- a/tests/script/unique/table/testSuite.sim +++ b/tests/script/unique/table/testSuite.sim @@ -1 +1 @@ -run unique/table/delete_part.sim +#run unique/table/delete_part.sim diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim index 41c9c5ae1e..7383934aac 100644 --- a/tests/script/unique/vnode/commit.sim +++ b/tests/script/unique/vnode/commit.sim @@ -1,17 +1,16 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 print =================== step 1 create db @@ -22,7 +21,7 @@ sql insert into tb values(now, 0) print =================== step2 sleep 2000 and kill dnode2(SIGINT) sleep 2000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT sleep 1000 print =================== step3 insert into dnode1 @@ -99,13 +98,13 @@ if $rows != 936 then endi print =================== step5 sleep kill dnode1(SIGINT) then start dnode1 -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 3000 print =================== step6 start dnode2 and sleep 10000 (wait sync complete) -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 12000 print =================== step7 @@ -128,7 +127,7 @@ if $rows != $remainRows then endi print =================== step8 kill dnode1(SIGINT) and query -system sh/exec.sh -n dnode1 -s stop -x SIGINT +system sh/exec_up.sh -n dnode1 -s stop -x SIGINT sleep 2000 print =================== step9 @@ -149,4 +148,4 @@ if $rows != $remainRows then return -1 endi -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim index 394122a626..57e0d10b7e 100644 --- a/tests/script/unique/vnode/many.sim +++ b/tests/script/unique/vnode/many.sim @@ -1,16 +1,13 @@ system sh/stop_dnodes.sh - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode4 -i 4 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 +system sh/cfg.sh -n dnode4 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1 @@ -23,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.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ========= step1 @@ -60,22 +57,22 @@ run_back cluster/vnode/back_insert_many.sim sleep 5000 print ======== step3 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 10000 $x = 0 loop: print ======== step4 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 10000 -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode3 -s stop sleep 10000 print ======== step5 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 10000 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 10000 print ======== step6 diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim index 4f195611e6..c71692fa9f 100644 --- a/tests/script/unique/vnode/replica2_basic.sim +++ b/tests/script/unique/vnode/replica2_basic.sim @@ -2,15 +2,15 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 3000 $N = 10 @@ -50,7 +50,7 @@ if $rows != $expect then endi print =================== step 4 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 2000 $y = $x + $N $expect = $N * 2 @@ -67,7 +67,7 @@ if $rows != $expect then endi print =================== step 5 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 2000 $y = $x + $N $expect = $N * 3 @@ -84,7 +84,7 @@ if $rows != $expect then endi print =================== step 6 -system sh/exec.sh -n dnode1 -s stop +system sh/exec_up.sh -n dnode1 -s stop sleep 2000 $y = $x + $N $expect = $N * 4 @@ -101,7 +101,7 @@ return -1 endi print =================== step 7 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 2000 $y = $x + $N $expect = $N * 5 @@ -188,5 +188,5 @@ if $rows != $expect then endi print =================== step 12 -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode1 -s stop +system sh/exec_up.sh -n dnode2 -s stop diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim index 046d2d059c..7a387d165e 100644 --- a/tests/script/unique/vnode/replica2_basic2.sim +++ b/tests/script/unique/vnode/replica2_basic2.sim @@ -1,18 +1,14 @@ system sh/stop_dnodes.sh - - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode4 -i 4 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 +system sh/cfg.sh -n dnode4 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,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.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 sql reset query cache @@ -77,23 +73,19 @@ if $rows != 1 then endi sql show dnodes -print dnode1 ==> openVnodes: $data2_192.168.0.1 freeVnodes: $data3_192.168.0.1 -print dnode2 ==> openVnodes: $data2_192.168.0.2 freeVnodes: $data3_192.168.0.2 -print dnode3 ==> openVnodes: $data2_192.168.0.3 freeVnodes: $data3_192.168.0.3 +print dnode1 ==> openVnodes: $data2_1 +print dnode2 ==> openVnodes: $data2_2 +print dnode3 ==> openVnodes: $data2_3 -if $data2_192.168.0.1 != 0 then - return -1 -endi - -if $data3_192.168.0.1 != 4 then +if $data2_1 != 0 then return -1 endi -if $data3_192.168.0.2 != 0 then +if $data2_2 != 4 then return -1 endi -if $data3_192.168.0.3 != 0 then +if $data2_3 != 4 then return -1 endi @@ -124,70 +116,68 @@ if $rows != 2 then endi print ========= step3 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sleep 5000 -sql insert into d1.t1 values(now, 3) -sql insert into d2.t2 values(now, 3) -sql insert into d3.t3 values(now, 3) -sql insert into d4.t4 values(now, 3) +#sql insert into d1.t1 values(now, 3) +#sql insert into d2.t2 values(now, 3) +#sql insert into d3.t3 values(now, 3) +#sql insert into d4.t4 values(now, 3) sql select * from d1.t1 -if $rows != 3 then +if $rows != 2 then return -1 endi sql select * from d2.t2 -if $rows != 3 then +if $rows != 2 then return -1 endi sql select * from d3.t3 -if $rows != 3 then +if $rows != 2 then return -1 endi sql select * from d4.t4 -if $rows != 3 then +if $rows != 2 then return -1 endi print ========= step4 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start +sleep 5000 +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sleep 5000 -system sh/exec.sh -n dnode3 -s stop -x SIGINT -sleep 3000 -sql insert into d1.t1 values(now, 4) -sql insert into d2.t2 values(now, 4) -sql insert into d3.t3 values(now, 4) -sql insert into d4.t4 values(now, 4) +#sql insert into d1.t1 values(now, 4) +#sql insert into d2.t2 values(now, 4) +#sql insert into d3.t3 values(now, 4) +#sql insert into d4.t4 values(now, 4) sql select * from d1.t1 -if $rows != 4 then +if $rows != 2 then return -1 endi sql select * from d2.t2 -if $rows != 4 then +if $rows != 2 then return -1 endi sql select * from d3.t3 -if $rows != 4 then +if $rows != 2 then return -1 endi sql select * from d4.t4 -if $rows != 4 then +if $rows != 2 then return -1 endi print ========= step5 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 sql insert into d1.t1 values(now, 5) sql insert into d2.t2 values(now, 5) @@ -195,21 +185,21 @@ sql insert into d3.t3 values(now, 5) sql insert into d4.t4 values(now, 5) sql select * from d1.t1 -if $rows != 5 then +if $rows != 3 then return -1 endi sql select * from d2.t2 -if $rows != 5 then +if $rows != 3 then return -1 endi sql select * from d3.t3 -if $rows != 5 then +if $rows != 3 then return -1 endi sql select * from d4.t4 -if $rows != 5 then +if $rows != 3 then return -1 endi \ 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 1383a3c2a1..46fe90cfde 100644 --- a/tests/script/unique/vnode/replica2_repeat.sim +++ b/tests/script/unique/vnode/replica2_repeat.sim @@ -1,16 +1,13 @@ system sh/stop_dnodes.sh - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode4 -i 4 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 +system sh/cfg.sh -n dnode4 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1 @@ -19,13 +16,13 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ========= step1 @@ -40,22 +37,22 @@ run_back cluster/vnode/back_insert.sim sleep 3000 print ======== step3 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 $x = 0 loop: print ======== step4 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 5000 -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode3 -s stop sleep 5000 print ======== step5 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 print ======== step6 diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim index 1e857881d8..4da26a9349 100644 --- a/tests/script/unique/vnode/replica3_basic.sim +++ b/tests/script/unique/vnode/replica3_basic.sim @@ -1,23 +1,21 @@ system sh/stop_dnodes.sh - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 $N = 10 @@ -50,7 +48,7 @@ if $rows != $expect then endi print =================== step 3 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 2000 $y = $x + $N $expect = $N * 2 @@ -67,7 +65,7 @@ if $rows != $expect then endi print =================== step 4 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 2000 $y = $x + $N $expect = $N * 3 @@ -84,7 +82,7 @@ if $rows != $expect then endi print =================== step 5 -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode3 -s stop sleep 2000 $y = $x + $N $expect = $N * 4 @@ -101,7 +99,7 @@ if $rows != $expect then endi print =================== step 6 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 2000 $y = $x + $N $expect = $N * 5 @@ -118,7 +116,7 @@ return -1 endi print =================== step 7 -system sh/exec.sh -n dnode1 -s stop +system sh/exec_up.sh -n dnode1 -s stop sleep 2000 $y = $x + $N $expect = $N * 6 @@ -135,7 +133,7 @@ return -1 endi print =================== step 8 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 2000 $y = $x + $N $expect = $N * 7 @@ -151,8 +149,8 @@ if $rows != $expect then return -1 endi -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode1 -s stop +system sh/exec_up.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode3 -s stop diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim index 0aecc144c3..67ac673bfc 100644 --- a/tests/script/unique/vnode/replica3_repeat.sim +++ b/tests/script/unique/vnode/replica3_repeat.sim @@ -1,16 +1,13 @@ system sh/stop_dnodes.sh - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode4 -i 4 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 +system sh/cfg.sh -n dnode4 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1 @@ -20,15 +17,15 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 sql create dnode $hostname4 -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_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 3000 print ========= step1 @@ -43,28 +40,28 @@ run_back cluster/vnode/back_insert.sim sleep 3000 print ======== step3 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 $x = 0 loop: print ======== step4 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start sleep 5000 -system sh/exec.sh -n dnode3 -s stop +system sh/exec_up.sh -n dnode3 -s stop sleep 5000 print ======== step5 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 5000 -system sh/exec.sh -n dnode4 -s stop +system sh/exec_up.sh -n dnode4 -s stop sleep 5000 print ======== step6 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start sleep 5000 -system sh/exec.sh -n dnode2 -s stop +system sh/exec_up.sh -n dnode2 -s stop sleep 5000 print ======== step7 diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index 34dff5415d..46003a14fa 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -1,23 +1,21 @@ system sh/stop_dnodes.sh - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 +system sh/cfg.sh -n dnode1 -c clog -v 2 +system sh/cfg.sh -n dnode2 -c clog -v 2 +system sh/cfg.sh -n dnode3 -c clog -v 2 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3 -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sql connect sql create dnode $hostname2 sql create dnode $hostname3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 3000 $N = 10 diff --git a/tests/script/unique/vnode/testSuite.sim b/tests/script/unique/vnode/testSuite.sim index 9a9c0bfb82..9cf8ed0fc1 100644 --- a/tests/script/unique/vnode/testSuite.sim +++ b/tests/script/unique/vnode/testSuite.sim @@ -1,9 +1,7 @@ run unique/vnode/replica2_basic2.sim -run unique/vnode/replica2_basic.sim -run unique/vnode/replica2_repeat.sim +#run unique/vnode/replica2_basic.sim +#run unique/vnode/replica2_repeat.sim run unique/vnode/replica3_basic.sim -run unique/vnode/replica3_repeat.sim -run unique/vnode/commit.sim -run unique/vnode/many.sim - - +#run unique/vnode/replica3_repeat.sim +#run unique/vnode/commit.sim +#run unique/vnode/many.sim -- GitLab