From a531f81bec4e11380923de4b3e3ddce704adaaff Mon Sep 17 00:00:00 2001 From: Hui Li Date: Mon, 13 Jul 2020 16:12:25 +0800 Subject: [PATCH] [temp not test drop dnode] --- tests/script/unique/cluster/cluster_main.sim | 69 ++++++++++++------- tests/script/unique/cluster/cluster_main1.sim | 31 +++++---- tests/script/unique/cluster/cluster_main2.sim | 31 +++++---- 3 files changed, 78 insertions(+), 53 deletions(-) diff --git a/tests/script/unique/cluster/cluster_main.sim b/tests/script/unique/cluster/cluster_main.sim index da4f709f46..4c02d416f3 100644 --- a/tests/script/unique/cluster/cluster_main.sim +++ b/tests/script/unique/cluster/cluster_main.sim @@ -71,7 +71,7 @@ print ============== step3: create stable stb1 $stb = stb1 sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8)) -print ============== step4: start 10 client1/ 10 client2/ 10 client3/ 10 client4/ 1 client5 +print ============== step4: start back client1_0.sim run_back unique/cluster/client1_0.sim #run_back unique/cluster/client1_1.sim #run_back unique/cluster/client1_2.sim @@ -106,26 +106,26 @@ endi print wait for a while to let clients start insert data sleep 5000 +print ============== step4-1: add dnode4/dnode5 into cluster +sql create dnode $hostname4 +sql create dnode $hostname5 + $loop_cnt = 0 loop_cluster_do: print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** **** -print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready +print ============== step5: start dnode4/dnode5 system sh/exec.sh -n dnode4 -s start system sh/exec.sh -n dnode5 -s start -sql create dnode $hostname4 -sql create dnode $hostname5 - -sleep 5000 - +sleep 20000 -print ============== step6: stop and drop dnode1, then remove data dir of dnode1 +print ============== step6: stop dnode1 system sh/exec.sh -n dnode1 -s stop -x SIGINT -sleep 5000 -sql drop dnode $hostname1 -sleep 5000 +sleep 10000 +#sql drop dnode $hostname1 +#sleep 5000 -system rm -rf ../../../sim/dnode1/data -sleep 20000 +#system rm -rf ../../../sim/dnode1/data +#sleep 20000 sql show mnodes print show mnodes @@ -140,6 +140,22 @@ print $data0_7 $data1_7 $data2_7 $data3_7 $data4_7 print $data0_8 $data1_8 $data2_8 $data3_8 $data4_8 print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 +print ============== step6-1: restart dnode1 +system sh/exec.sh -n dnode1 -s start +sleep 10000 +sql show mnodes +print show mnodes +print rows: $rows +print $data0_1 $data1_1 $data2_1 $data3_1 $data4_1 +print $data0_2 $data1_2 $data2_2 $data3_2 $data4_2 +print $data0_3 $data1_3 $data2_3 $data3_3 $data4_3 +print $data0_4 $data1_4 $data2_4 $data3_4 $data4_4 +print $data0_5 $data1_5 $data2_5 $data3_5 $data4_5 +print $data0_6 $data1_6 $data2_6 $data3_6 $data4_6 +print $data0_7 $data1_7 $data2_7 $data3_7 $data4_7 +print $data0_8 $data1_8 $data2_8 $data3_8 $data4_8 +print $data0_9 $data1_9 $data2_9 $data3_9 $data4_9 + print ============== step7: stop dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 5000 @@ -235,14 +251,17 @@ if $data04 != 2 then return -1 endi -print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 +print ============== step14: stop dnode4/dnode5 system sh/exec.sh -n dnode4 -s stop -x SIGINT system sh/exec.sh -n dnode5 -s stop -x SIGINT sleep 20000 -sql drop dnode $hostname4 -sql drop dnode $hostname5 -system rm -rf ../../../sim/dnode4/data -system rm -rf ../../../sim/dnode5/data +#system sh/exec.sh -n dnode4 -s start +#system sh/exec.sh -n dnode5 -s start +#sleep 10000 +#sql drop dnode $hostname4 +#sql drop dnode $hostname5 +#system rm -rf ../../../sim/dnode4/data +#system rm -rf ../../../sim/dnode5/data print ============== step15: alter replica 1 sql alter database $db replica 1 @@ -262,13 +281,13 @@ if $data04 != 2 then return -1 endi -print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready -system sh/cfg.sh -n dnode1 -c first -v $hostname2 -system sh/cfg.sh -n dnode1 -c second -v $hostname3 - -system sh/exec.sh -n dnode1 -s start -sql create dnode $hostname1 -sleep 20000 +#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready +#system sh/cfg.sh -n dnode1 -c first -v $hostname2 +#system sh/cfg.sh -n dnode1 -c second -v $hostname3 +# +#system sh/exec.sh -n dnode1 -s start +#sql create dnode $hostname1 +#sleep 20000 print ============== step18: alter replica 3 sql alter database $db replica 3 diff --git a/tests/script/unique/cluster/cluster_main1.sim b/tests/script/unique/cluster/cluster_main1.sim index 343924dfee..82e1e2be83 100644 --- a/tests/script/unique/cluster/cluster_main1.sim +++ b/tests/script/unique/cluster/cluster_main1.sim @@ -104,15 +104,18 @@ endi print wait for a while to let clients start insert data sleep 5000 +print ============== step4-1: add dnode4/dnode5 into cluster +sql create dnode $hostname4 +sql create dnode $hostname5 +sleep 5000 + $loop_cnt = 0 loop_cluster_do: print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** **** -print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready +print ============== step5: start dnode4/dnode5 system sh/exec.sh -n dnode4 -s start system sh/exec.sh -n dnode5 -s start -sql create dnode $hostname4 -sql create dnode $hostname5 -sleep 5000 +sleep 20000 print ============== step6: stop dnode1 system sh/exec.sh -n dnode1 -s stop -x SIGINT @@ -207,9 +210,9 @@ print ============== step11: stop dnode4, then wait sync end system sh/exec.sh -n dnode4 -s stop -x SIGINT sleep 20000 -print ============== step12: restart dnode4, then wait sync end -system sh/exec.sh -n dnode4 -s start -sleep 20000 +#print ============== step12: restart dnode4, then wait sync end +#system sh/exec.sh -n dnode4 -s start +#sleep 20000 sql show mnodes print show mnodes print rows: $rows @@ -243,15 +246,15 @@ if $replica != 2 then return -1 endi -print ============== step14: drop dnode4, then remove data dir -sql drop dnode $hostname4 +print ============== step14: stop dnode5 +system sh/exec.sh -n dnode5 -s stop -x SIGINT sleep 20000 -system rm -rf ../../../sim/dnode4/data +#system rm -rf ../../../sim/dnode5/data -print ============== step14-1: drop dnode5, then remove data dir -sql drop dnode $hostname5 -sleep 20000 -system rm -rf ../../../sim/dnode5/data +#print ============== step14-1: drop dnode5, then remove data dir +#sql drop dnode $hostname5 +#sleep 20000 +#system rm -rf ../../../sim/dnode5/data print ============== step15: alter replica 1 sql alter database $db replica 1 diff --git a/tests/script/unique/cluster/cluster_main2.sim b/tests/script/unique/cluster/cluster_main2.sim index 83934da457..e5fe3f2a21 100644 --- a/tests/script/unique/cluster/cluster_main2.sim +++ b/tests/script/unique/cluster/cluster_main2.sim @@ -108,15 +108,18 @@ endi print wait for a while to let clients start insert data sleep 5000 +print ============== step4-1: add dnode4/dnode5 into cluster +sql create dnode $hostname4 +sql create dnode $hostname5 +sleep 5000 + + $loop_cnt = 0 loop_cluster_do: print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** **** -print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready +print ============== step5: start dnode4/dnode5 system sh/exec.sh -n dnode4 -s start system sh/exec.sh -n dnode5 -s start -sql create dnode $hostname4 -sql create dnode $hostname5 -sleep 5000 print ============== step6: stop dnode1 system sh/exec.sh -n dnode1 -s stop -x SIGINT @@ -211,9 +214,9 @@ print ============== step11: stop dnode4, then wait sync end system sh/exec.sh -n dnode4 -s stop -x SIGINT sleep 20000 -print ============== step12: restart dnode4, then wait sync end -system sh/exec.sh -n dnode4 -s start -sleep 20000 +#print ============== step12: restart dnode4, then wait sync end +#system sh/exec.sh -n dnode4 -s start +#sleep 20000 sql show mnodes print show mnodes print rows: $rows @@ -247,15 +250,15 @@ if $replica != 2 then return -1 endi -print ============== step14: drop dnode4, then remove data dir -sql drop dnode $hostname4 +print ============== step14: drop dnode5, then remove data dir +system sh/exec.sh -n dnode5 -s stop -x SIGINT sleep 20000 -system rm -rf ../../../sim/dnode4/data +#system rm -rf ../../../sim/dnode5/data -print ============== step14-1: drop dnode5, then remove data dir -sql drop dnode $hostname5 -sleep 20000 -system rm -rf ../../../sim/dnode5/data +#print ============== step14-1: drop dnode5, then remove data dir +#sql drop dnode $hostname5 +#sleep 20000 +#system rm -rf ../../../sim/dnode5/data print ============== step15: alter replica 1 sql alter database $db replica 1 -- GitLab