From d7683010760216c8c5682a223fc2095198fff1e5 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 11 May 2020 12:07:33 +0800 Subject: [PATCH 1/6] change mnode ip list in dnode --- src/dnode/src/dnodeMgmt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c index 62d22573ff..0e91cc7155 100644 --- a/src/dnode/src/dnodeMgmt.c +++ b/src/dnode/src/dnodeMgmt.c @@ -266,9 +266,12 @@ static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg) { return taosCfgDynamicOptions(pCfg->config); } - void dnodeUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) { - dTrace("mgmt IP list is changed for ufp is called"); + dPrint("mnode IP list is changed for ufp is called, numOfIps:%d inUse:%d", pIpSet->numOfIps, pIpSet->inUse); + for (int i = 0; i < pIpSet->numOfIps; ++i) { + dPrint("mnode index:%d %s:%u", i, pIpSet->fqdn[i], pIpSet->port[i]) + } + tsMnodeIpSet = *pIpSet; } From fd9a32b619e82cb8572648e76901512df636c543 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 11 May 2020 13:08:52 +0800 Subject: [PATCH 2/6] scripts --- tests/script/general/db/delete_reuse2.sim | 1 + tests/script/jenkins/basic.txt | 23 ++++----- tests/script/sh/deploy.sh | 2 +- .../script/unique/account/account_create.sim | 2 +- .../script/unique/account/account_delete.sim | 2 +- tests/script/unique/account/account_len.sim | 2 +- tests/script/unique/account/authority.sim | 2 +- tests/script/unique/account/basic.sim | 1 + tests/script/unique/account/paras.sim | 1 + tests/script/unique/account/pass_alter.sim | 2 +- tests/script/unique/account/pass_len.sim | 2 +- tests/script/unique/account/usage.sim | 1 + tests/script/unique/account/user_create.sim | 2 +- tests/script/unique/account/user_len.sim | 2 +- tests/script/unique/big/balance.sim | 48 +++++++++---------- tests/script/unique/big/maxvnodes.sim | 5 +- tests/script/unique/big/tcp.sim | 8 ++-- tests/script/unique/mnode/mgmt23.sim | 6 +-- tests/script/unique/mnode/mgmt25.sim | 4 +- tests/script/unique/mnode/mgmt26.sim | 6 +-- tests/script/unique/mnode/mgmt33.sim | 10 ++-- tests/script/unique/mnode/mgmt34.sim | 18 +++---- 22 files changed, 76 insertions(+), 74 deletions(-) diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim index 0117d87104..d8b2763042 100644 --- a/tests/script/general/db/delete_reuse2.sim +++ b/tests/script/general/db/delete_reuse2.sim @@ -26,6 +26,7 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 print ========= start dnodes +sleep 2000 system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index d96a1db2b4..44fda21d33 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -53,7 +53,7 @@ cd ../../../debug; make ./test.sh -f general/db/delete_reuse1.sim ./test.sh -f general/db/delete_reuse2.sim ./test.sh -f general/db/delete_reusevnode.sim -#./test.sh -f general/db/delete_reusevnode2.sim +./test.sh -f general/db/delete_reusevnode2.sim ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/len.sim @@ -253,7 +253,7 @@ cd ../../../debug; make #./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 -u -f unique/big/tcp.sim ##./test.sh -u -f unique/cluster/balance1.sim ##./test.sh -u -f unique/cluster/balance2.sim @@ -298,13 +298,13 @@ cd ../../../debug; make #./test.sh -u -f unique/metrics/replica3_dnode6.sim #./test.sh -u -f unique/metrics/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/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 -u -f unique/mnode/secondIp.sim @@ -312,13 +312,10 @@ cd ../../../debug; make ##./test.sh -u -f unique/table/delete_part.sim -##./test.sh -u -f unique/vnode/replica2_basic2.sim -##./test.sh -u -f unique/vnode/replica3_basic.sim - #./test.sh -u -f unique/vnode/commit.sim #./test.sh -u -f unique/vnode/many.sim #./test.sh -u -f unique/vnode/replica2_basic.sim -##./test.sh -u -f unique/vnode/replica2_basic2.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 diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 5587e3bb8c..bc18479896 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -99,7 +99,7 @@ echo "logDir $LOG_DIR" >> $TAOS_CFG echo "dDebugFlag 199" >> $TAOS_CFG echo "mDebugFlag 199" >> $TAOS_CFG echo "sdbDebugFlag 199" >> $TAOS_CFG -echo "rpcDebugFlag 135" >> $TAOS_CFG +echo "rpcDebugFlag 151" >> $TAOS_CFG echo "tmrDebugFlag 131" >> $TAOS_CFG echo "cDebugFlag 135" >> $TAOS_CFG echo "httpDebugFlag 135" >> $TAOS_CFG diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim index d1d5ebece0..1966e1a7ce 100644 --- a/tests/script/unique/account/account_create.sim +++ b/tests/script/unique/account/account_create.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect print ============================ dnode1 start diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim index 71a75a7b35..40075dc1a6 100644 --- a/tests/script/unique/account/account_delete.sim +++ b/tests/script/unique/account/account_delete.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect print ============= step1 sql create account oroot pass 'taosdata' diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim index ae2db26d58..81d0f0bfb1 100644 --- a/tests/script/unique/account/account_len.sim +++ b/tests/script/unique/account/account_len.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect $i = 0 $dbPrefix = aldb diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim index fe978a5827..2bb61cb0f2 100644 --- a/tests/script/unique/account/authority.sim +++ b/tests/script/unique/account/authority.sim @@ -4,8 +4,8 @@ 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 -sql connect sleep 3000 +sql connect print ============= step1 diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim index d06f7a15d9..adbc84d766 100644 --- a/tests/script/unique/account/basic.sim +++ b/tests/script/unique/account/basic.sim @@ -1,6 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start +sleep 3000 sql connect print =============== show accounts diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim index b2e540400c..70a423f70f 100644 --- a/tests/script/unique/account/paras.sim +++ b/tests/script/unique/account/paras.sim @@ -1,6 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start +sleep 3000 sql connect print =============== show accounts diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index 936611833a..644548be0b 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect print ============= step1 sql create user read pass 'taosdata1' diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim index f4f9c04964..370ea94200 100644 --- a/tests/script/unique/account/pass_len.sim +++ b/tests/script/unique/account/pass_len.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect $i = 0 $dbPrefix = apdb diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim index f022380ac4..63c3d49f43 100644 --- a/tests/script/unique/account/usage.sim +++ b/tests/script/unique/account/usage.sim @@ -1,6 +1,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start +sleep 3000 sql connect print =============== show accounts diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim index 789035cfcc..2a64786225 100644 --- a/tests/script/unique/account/user_create.sim +++ b/tests/script/unique/account/user_create.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect print =============== step1 sql show users diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim index 918551fa66..1163ac2e4b 100644 --- a/tests/script/unique/account/user_len.sim +++ b/tests/script/unique/account/user_len.sim @@ -3,8 +3,8 @@ 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 -sql connect sleep 3000 +sql connect $i = 0 $dbPrefix = lm_us_db diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 52199f046e..4b0a6cd0bf 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.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect @@ -87,7 +87,7 @@ endi print ========== step1 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start $x = 0 show1: @@ -98,12 +98,12 @@ show1: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode2 freeVnodes $data3_192.168.0.2 -if $data3_192.168.0.1 != 2 then +print dnode1 openvnodes $data2_1 +print dnode2 openvnodes $data2_2 +if $data2_1 != 2 then goto show1 endi -if $data3_192.168.0.2 != 2 then +if $data2_2 != 2 then goto show1 endi @@ -139,7 +139,7 @@ endi print ========== step2 sql create dnode $hostname3 -system sh/exec.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode3 -s start sleep 10000 print ========== step3 @@ -154,20 +154,20 @@ show3: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode2 freeVnodes $data3_192.168.0.2 -print dnode3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 2 then +print dnode1 freeVnodes $data2_1 +print dnode2 freeVnodes $data2_2 +print dnode3 freeVnodes $data2_3 +if $data2_1 != 2 then goto show3 endi -if $data3_192.168.0.2 != NULL then +if $data2_2 != NULL then goto show3 endi -if $data3_192.168.0.3 != 2 then +if $data2_3 != 2 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 sql select count(*) from t10 print select count(*) from t10 $data00 expect $rowNum @@ -211,16 +211,16 @@ show4: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 0 then +print dnode1 freeVnodes $data2_1 +print dnode3 freeVnodes $data2_3 +if $data2_1 != 0 then goto show4 endi -if $data3_192.168.0.3 != NULL then +if $data2_3 != NULL then goto show4 endi -system sh/exec.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode3 -s stop -x SIGINT sql select count(*) from t10 print select count(*) from t10 $data00 expect $rowNum @@ -255,7 +255,7 @@ endi print ========== step5 sql alter database db replica 2 sql create dnode $hostname4 -system sh/exec.sh -n dnode4 -s start +system sh/exec_up.sh -n dnode4 -s start $x = 0 show5: @@ -266,12 +266,12 @@ show5: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode4 freeVnodes $data3_192.168.0.4 -if $data3_192.168.0.1 != 0 then +print dnode1 freeVnodes $data2_1 +print dnode4 freeVnodes $data2_4 +if $data2_1 != 0 then goto show5 endi -if $data3_192.168.0.4 != 0 then +if $data2_4 != 0 then goto show5 endi diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index 00995ba32c..b0a0119ca7 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -10,7 +10,8 @@ system sh/cfg.sh -n dnode1 -c maxShellConns -v 100000 system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 100000 print ========== prepare data -system sh/exec.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode1 -s start +sleep 3000 sql connect sql create database db sql use db @@ -49,7 +50,7 @@ system sh/cfg.sh -n dnode2 -c maxMgmtConnections -v 100000 print ========== step2 sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start +system sh/exec_up.sh -n dnode2 -s start $x = 0 show3: diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index 1fb414ec74..590035c0f8 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -14,8 +14,8 @@ 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.sh -n dnode1 -s start - +system sh/exec_up.sh -n dnode1 -s start +sleep 3000 sql connect print ======================== dnode1 start @@ -52,7 +52,7 @@ while $i < $tbNum endw $i = 0 -while $i < 100 +while $i < 10 print =============== step3 $i sql select count(*) from $mt print ===> $data00 $data01 @@ -83,7 +83,7 @@ while $i < $tbNum endw $i = 0 -while $i < 100 +while $i < 10 print =============== step5 $i sql select count(*) from $mt where tgcol < 20200 print ===> $data00 $data01 diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index 99d9159573..8c144dd0c4 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != NULL then +if $dnode3Role != null then return -1 endi @@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then @@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index ba545f9479..8c8eeba466 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != NULL then +if $dnode3Role != null then return -1 endi @@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index e5ead5bb39..373a0abaed 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -59,7 +59,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != NULL then +if $dnode3Role != null then return -1 endi @@ -79,7 +79,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then @@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index 36b7ba8139..e3a62a2d22 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -18,10 +18,10 @@ print dnode3 ==> $data3_3 if $data2_1 != master then return -1 endi -if $data3_2 != NULL then +if $data3_2 != null then return -1 endi -if $data3_3 != NULL then +if $data3_3 != null then return -1 endi @@ -44,7 +44,7 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != NULL then +if $dnode3Role != null then return -1 endi @@ -86,7 +86,7 @@ print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then @@ -156,7 +156,7 @@ print dnode1 ==> $dnode1Role print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role -if $dnode1Role != NULL then +if $dnode1Role != null then return -1 endi #if $dnode2Role != master then diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index 1139daea1c..4409c825c8 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -22,10 +22,10 @@ print dnode3 ==> $data3_3 if $data2_1 != master then return -1 endi -if $data3_2 != NULL then +if $data3_2 != null then return -1 endi -if $data3_3 != NULL then +if $data3_3 != null then return -1 endi @@ -50,10 +50,10 @@ endi if $dnode2Role != slave then return -1 endi -if $dnode3Role != NULL then +if $dnode3Role != null then return -1 endi -if $dnode4Role != NULL then +if $dnode4Role != null then return -1 endi @@ -81,7 +81,7 @@ endi if $dnode3Role != slave then return -1 endi -if $dnode4Role != NULL then +if $dnode4Role != null then return -1 endi @@ -110,7 +110,7 @@ endi if $dnode3Role != slave then return -1 endi -if $dnode4Role != NULL then +if $dnode4Role != null then return -1 endi @@ -131,7 +131,7 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then @@ -165,7 +165,7 @@ print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 endi -if $dnode2Role != NULL then +if $dnode2Role != null then return -1 endi if $dnode3Role != slave then @@ -207,7 +207,7 @@ print dnode2 ==> $dnode2Role print dnode3 ==> $dnode3Role print dnode4 ==> $dnode4Role -if $dnode1Role != NULL then +if $dnode1Role != null then return -1 endi if $dnode2Role != slave then From a539bac6d22fc3582f53ba89f9c90a97e33b468c Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 11 May 2020 14:51:56 +0800 Subject: [PATCH 3/6] scripts --- tests/script/general/db/testSuite.sim | 3 +- tests/script/general/db/vnodes.sim | 45 +++++++++++++ tests/script/jenkins/basic.txt | 95 +++++++++++++-------------- tests/script/unique/big/maxvnodes.sim | 31 +++++---- 4 files changed, 112 insertions(+), 62 deletions(-) create mode 100644 tests/script/general/db/vnodes.sim diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim index 2cac8b8fa8..87863001a3 100644 --- a/tests/script/general/db/testSuite.sim +++ b/tests/script/general/db/testSuite.sim @@ -1,4 +1,4 @@ -run general//db/basic.sim +run general/db/basic.sim run general/db/basic1.sim run general/db/basic2.sim run general/db/basic3.sim @@ -13,3 +13,4 @@ run general/db/delete_writing2.sim run general/db/len.sim run general/db/repeat.sim run general/db/tables.sim +run general/db/vnodes.sim diff --git a/tests/script/general/db/vnodes.sim b/tests/script/general/db/vnodes.sim new file mode 100644 index 0000000000..87e821fde3 --- /dev/null +++ b/tests/script/general/db/vnodes.sim @@ -0,0 +1,45 @@ +system sh/stop_dnodes.sh + +$totalVnodes = 100 +$maxTables = 4 +$totalRows = $totalVnodes * $maxTables + +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 maxtablesPerVnode -v $maxTables +system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v $totalVnodes +system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000 +system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000 +system sh/cfg.sh -n dnode1 -c maxShellConns -v 100000 +system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 100000 + +print ========== prepare data +system sh/exec.sh -n dnode1 -s start +sleep 3000 +sql connect +sql create database db blocks 2 cache 1 maxTables $maxTables +sql use db + +print ========== step1 +sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int) + +$x = 0 +while $x < $totalRows + $tb = t . $x + sql create table $tb using mt tags( $x ) + sql insert into $tb values (now, $x ) + $x = $x + 1 +endw + +print ========== step2 +sql select * from mt +if $rows != $totalRows then + return -1 +endi + +sql select count(*) from mt +if $data00 != $totalRows then + return -1 +endi + +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 44fda21d33..f73a23f184 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -15,12 +15,12 @@ cd ../../../debug; make #./test.sh -f general/alter/table.sim ./test.sh -f general/cache/new_metrics.sim -#./test.sh -f general/cache/restart_metrics.sim +./test.sh -f general/cache/restart_metrics.sim ./test.sh -f general/cache/restart_table.sim -#./test.sh -f general/column/commit.sim -#./test.sh -f general/column/metrics.sim -#./test.sh -f general/column/table.sim +#hongze ./test.sh -f general/column/commit.sim +#hongze ./test.sh -f general/column/metrics.sim +#hongze ./test.sh -f general/column/table.sim ./test.sh -f general/compress/commitlog.sim ./test.sh -f general/compress/compress.sim @@ -31,11 +31,11 @@ cd ../../../debug; make ./test.sh -f general/compute/bottom.sim ./test.sh -f general/compute/count.sim ./test.sh -f general/compute/diff.sim -#./test.sh -f general/compute/diff2.sim +# liao./test.sh -f general/compute/diff2.sim ./test.sh -f general/compute/first.sim -#./test.sh -f general/compute/interval.sim -#./test.sh -f general/compute/last.sim -#./test.sh -f general/compute/leastsquare.sim +# liao./test.sh -f general/compute/interval.sim +# liao./test.sh -f general/compute/last.sim +# liao./test.sh -f general/compute/leastsquare.sim ./test.sh -f general/compute/max.sim ./test.sh -f general/compute/min.sim ./test.sh -f general/compute/null.sim @@ -57,37 +57,38 @@ cd ../../../debug; make ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/len.sim +#./test.sh -u -f general/db/vnodes.sim ./test.sh -f general/db/repeat.sim ./test.sh -f general/db/tables.sim -#./test.sh -f general/field/2.sim +./test.sh -f general/field/2.sim #./test.sh -f general/field/3.sim #./test.sh -f general/field/4.sim #./test.sh -f general/field/5.sim #./test.sh -f general/field/6.sim -##./test.sh -f general/field/bigint.sim -#./test.sh -f general/field/binary.sim -##./test.sh -f general/field/bool.sim -#./test.sh -f general/field/single.sim -##./test.sh -f general/field/smallint.sim -##./test.sh -f general/field/tinyint.sim +./test.sh -f general/field/bigint.sim +# liao./test.sh -f general/field/binary.sim +./test.sh -f general/field/bool.sim +./test.sh -f general/field/single.sim +./test.sh -f general/field/smallint.sim +./test.sh -f general/field/tinyint.sim -##./test.sh -f general/http/restful.sim +# jeff ./test.sh -f general/http/restful.sim ./test.sh -f general/http/restful_insert.sim ./test.sh -f general/http/restful_limit.sim -##./test.sh -f general/http/restful_full.sim +# jeff ./test.sh -f general/http/restful_full.sim ./test.sh -f general/http/prepare.sim ./test.sh -f general/http/telegraf.sim ./test.sh -f general/http/grafana_bug.sim -#./test.sh -f general/http/grafana.sim +# jeff ./test.sh -f general/http/grafana.sim ./test.sh -f general/import/basic.sim ./test.sh -f general/import/commit.sim ./test.sh -f general/import/large.sim -#./test.sh -f general/import/replica1.sim +#hongze ./test.sh -f general/import/replica1.sim ./test.sh -f general/insert/basic.sim -#./test.sh -f general/insert/insert_drop.sim +#hongze ./test.sh -f general/insert/insert_drop.sim ./test.sh -f general/insert/query_block1_memory.sim ./test.sh -f general/insert/query_block2_memory.sim ./test.sh -f general/insert/query_block1_file.sim @@ -96,8 +97,6 @@ cd ../../../debug; make ./test.sh -f general/insert/query_multi_file.sim ./test.sh -f general/insert/tcp.sim -#parser - # ./test.sh -f general/parser/alter.sim # ./test.sh -f general/parser/alter1.sim # ./test.sh -f general/parser/alter_stable.sim @@ -112,8 +111,8 @@ cd ../../../debug; make ./test.sh -f general/parser/columnValue_float.sim ./test.sh -f general/parser/columnValue_int.sim # ./test.sh -f general/parser/col_arithmetic_operation.sim -# ./test.sh -f general/parser/columnValue.sim -# ./test.sh -f general/parser/commit.sim +./test.sh -f general/parser/columnValue.sim +./test.sh -f general/parser/commit.sim # ./test.sh -f general/parser/create_db.sim # ./test.sh -f general/parser/create_mt.sim # ./test.sh -f general/parser/create_tb.sim @@ -121,9 +120,9 @@ cd ../../../debug; make # ./test.sh -f general/parser/fill.sim # ./test.sh -f general/parser/fill_stb.sim # ./test.sh -f general/parser/first_last.sim -# ./test.sh -f general/parser/import_commit1.sim -# ./test.sh -f general/parser/import_commit2.sim -# ./test.sh -f general/parser/import_commit3.sim +./test.sh -f general/parser/import_commit1.sim +./test.sh -f general/parser/import_commit2.sim +./test.sh -f general/parser/import_commit3.sim # ./test.sh -f general/parser/import_file.sim # ./test.sh -f general/parser/insert_tb.sim # ./test.sh -f general/parser/tags_dynamically_specifiy.sim @@ -167,7 +166,7 @@ cd ../../../debug; make ./test.sh -f general/table/autocreate.sim ./test.sh -f general/table/basic1.sim ./test.sh -f general/table/basic2.sim -./test.sh -f general/table/basic3.sim +#hongze ./test.sh -f general/table/basic3.sim ./test.sh -f general/table/bigint.sim ./test.sh -f general/table/binary.sim ./test.sh -f general/table/bool.sim @@ -187,7 +186,7 @@ cd ../../../debug; make ./test.sh -f general/table/int.sim ./test.sh -f general/table/limit.sim ./test.sh -f general/table/smallint.sim -#./test.sh -f general/table/table_len.sim +./test.sh -f general/table/table_len.sim ./test.sh -f general/table/table.sim ./test.sh -f general/table/tinyint.sim ./test.sh -f general/table/vgroup.sim @@ -197,45 +196,45 @@ cd ../../../debug; make #./test.sh -f general/tag/5.sim #./test.sh -f general/tag/6.sim #./test.sh -f general/tag/add.sim -#./test.sh -f general/tag/bigint.sim +./test.sh -f general/tag/bigint.sim #./test.sh -f general/tag/binary_binary.sim #./test.sh -f general/tag/binary.sim #./test.sh -f general/tag/bool_binary.sim #./test.sh -f general/tag/bool_int.sim -#./test.sh -f general/tag/bool.sim +./test.sh -f general/tag/bool.sim #./test.sh -f general/tag/change.sim -#./test.sh -f general/tag/column.sim +#liao ./test.sh -f general/tag/column.sim #./test.sh -f general/tag/commit.sim -#./test.sh -f general/tag/create.sim +#liao ./test.sh -f general/tag/create.sim #./test.sh -f general/tag/delete.sim #./test.sh -f general/tag/double.sim -#./test.sh -f general/tag/filter.sim +./test.sh -f general/tag/filter.sim #./test.sh -f general/tag/float.sim #./test.sh -f general/tag/int_binary.sim #./test.sh -f general/tag/int_float.sim -#./test.sh -f general/tag/int.sim +./test.sh -f general/tag/int.sim #./test.sh -f general/tag/set.sim -#./test.sh -f general/tag/smallint.sim -#./test.sh -f general/tag/tinyint.sim +./test.sh -f general/tag/smallint.sim +./test.sh -f general/tag/tinyint.sim ./test.sh -f general/user/basic1.sim -#./test.sh -f general/user/monitor.sim +./test.sh -f general/user/monitor.sim ./test.sh -f general/user/pass_alter.sim ./test.sh -f general/user/pass_len.sim ./test.sh -f general/user/user_create.sim ./test.sh -f general/user/user_len.sim -#./test.sh -f general/vector/metrics_field.sim -#./test.sh -f general/vector/metrics_mix.sim -#./test.sh -f general/vector/metrics_query.sim -#./test.sh -f general/vector/metrics_tag.sim -#./test.sh -f general/vector/metrics_time.sim -#./test.sh -f general/vector/multi.sim +./test.sh -f general/vector/metrics_field.sim +./test.sh -f general/vector/metrics_mix.sim +./test.sh -f general/vector/metrics_query.sim +./test.sh -f general/vector/metrics_tag.sim +./test.sh -f general/vector/metrics_time.sim +#liao ./test.sh -f general/vector/multi.sim ./test.sh -f general/vector/single.sim -#./test.sh -f general/vector/table_field.sim -#./test.sh -f general/vector/table_mix.sim -#./test.sh -f general/vector/table_query.sim -#./test.sh -f general/vector/table_time.sim +./test.sh -f general/vector/table_field.sim +./test.sh -f general/vector/table_mix.sim +./test.sh -f general/vector/table_query.sim +./test.sh -f general/vector/table_time.sim ################################# diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index b0a0119ca7..3015d07b6d 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,9 +1,15 @@ system sh/stop_dnodes.sh +$totalVnodes = 100 +$minVnodes = 48 +$maxVnodes = 52 +$maxTables = 4 +$totalRows = $totalVnodes * $maxTables + 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 maxtablesPerVnode -v 100 -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $maxTables +system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v $totalVnodes system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000 system sh/cfg.sh -n dnode1 -c maxShellConns -v 100000 @@ -13,14 +19,14 @@ print ========== prepare data system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect -sql create database db +sql create database db blocks 2 cache 1 maxTables $maxTables sql use db print ========== step1 sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int) $x = 0 -while $x < 25600 +while $x < $totalRows $tb = t . $x sql create table $tb using mt tags( $x ) sql insert into $tb values (now, $x ) @@ -29,16 +35,15 @@ endw print ========== step2 sql select * from mt -if $rows != 25600 then +if $rows != $totalRows then return -1 endi sql select count(*) from mt -if $data00 != 25600 then +if $data00 != $totalRows then return -1 endi - system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 100 @@ -61,23 +66,23 @@ show3: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode2 freeVnodes $data3_192.168.0.2 -if $data3_192.168.0.1 != 126 then +print dnode1 openvnodes $data2_1 +print dnode2 openvnodes $data2_2 +if $data2_1 != $minVnodes then goto show3 endi -if $data3_192.168.0.2 != 130 then +if $data2_2 != $maxVnodes then goto show3 endi print ========== step4 sql select * from mt -if $rows != 25600 then +if $rows != $totalRows then return -1 endi sql select count(*) from mt -if $data00 != 25600 then +if $data00 != $totalRows then return -1 endi From 24aea5d7060573b2d3f295519572d8cea9ca3eff Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 11 May 2020 14:54:42 +0800 Subject: [PATCH 4/6] scripts --- tests/script/basicSuite.sim | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index aa0fbf65b7..a99edfd93d 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -1,26 +1,20 @@ -################################# run general/cache/new_metrics.sim run general/compress/compress.sim run general/compute/avg.sim -run general/compute/bottom.sim run general/compute/count.sim run general/db/len.sim run general/db/basic4.sim run general/http/restful_insert.sim run general/import/basic.sim run general/import/commit.sim -run general/insert/basic.sim run general/insert/query_file_memory.sim run general/parser/binary_escapeCharacter.sim run general/parser/columnValue_bigint.sim run general/parser/select_from_cache_disk.sim run general/table/autocreate.sim -run general/table/basic3.sim run general/table/column_name.sim run general/table/int.sim run general/table/vgroup.sim run general/user/basic1.sim run general/user/pass_alter.sim -run general/user/user_len.sim run general/vector/single.sim -################################## From cbd4542120f5bca427622bad23ecdecd0de2ac8b Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 11 May 2020 15:10:17 +0800 Subject: [PATCH 5/6] execute all cases even some failed early. --- .travis.yml | 2 +- tests/test-all.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b460ad05b0..72970bc1e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,7 +163,7 @@ matrix: cd ${TRAVIS_BUILD_DIR}/tests - ./test-all.sh $TRAVIS_EVENT_TYPE + ./test-all.sh $TRAVIS_EVENT_TYPE COVER TEST_RESULT=$? diff --git a/tests/test-all.sh b/tests/test-all.sh index 93bfa7a426..e58a6f5132 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -21,11 +21,12 @@ fi echo -e "${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}" totalFailed=`grep 'failed\|fault' out.txt | wc -l` -echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" +# echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" if [ "$totalFailed" -ne "0" ]; then -# echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" - exit $totalFailed + echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" + +# exit $totalFailed fi echo "### run Python script ###" @@ -46,6 +47,7 @@ fi totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l` if [ "$totalPyFailed" -ne "0" ]; then echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" - exit $totalPyFailed +# exit $totalPyFailed fi +exit $(($totalFailed + $totalPyFailed)) From 459c267a2a0d5b30ac9d69da71104f0a78753c66 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 11 May 2020 16:04:49 +0800 Subject: [PATCH 6/6] add log for database create --- src/mnode/src/mgmtDb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c index 4f54a85baa..2f17df92fa 100644 --- a/src/mnode/src/mgmtDb.c +++ b/src/mnode/src/mgmtDb.c @@ -297,8 +297,10 @@ static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate) { if (pDb != NULL) { mgmtDecDbRef(pDb); if (pCreate->ignoreExist) { + mTrace("db:%s, already exist, ignore exist is set", pCreate->db); return TSDB_CODE_SUCCESS; } else { + mError("db:%s, is already exist, ignore exist not set", pCreate->db); return TSDB_CODE_DB_ALREADY_EXIST; } } @@ -751,6 +753,8 @@ static void mgmtProcessCreateDbMsg(SQueuedMsg *pMsg) { code = mgmtCreateDb(pMsg->pUser->pAcct, pCreate); if (code == TSDB_CODE_SUCCESS) { mLPrint("db:%s, is created by %s", pCreate->db, pMsg->pUser->user); + } else { + mError("db:%s, failed to create, reason:%s", pCreate->db, tstrerror(code)); } }