adjust CI sequence

1b11d6d9 · Shengliang Guan · 8438e4f0 · 1b11d6d9 · 1b11d6d9 · 1b11d6d9
3 changed file
--- a/tests/script/jenkins/basic_3.txt
+++ b/tests/script/jenkins/basic_3.txt

-./test.sh -f unique/stable/balance_replica1.sim
-./test.sh -f unique/stable/dnode2_stop.sim
-./test.sh -f unique/stable/dnode2.sim
-./test.sh -f unique/stable/dnode3.sim
-./test.sh -f unique/stable/replica2_dnode4.sim
-./test.sh -f unique/stable/replica2_vnode3.sim
-./test.sh -f unique/stable/replica3_dnode6.sim
-./test.sh -f unique/stable/replica3_vnode3.sim
-
-./test.sh -f unique/mnode/mgmt20.sim
-./test.sh -f unique/mnode/mgmt21.sim
-./test.sh -f unique/mnode/mgmt22.sim
-./test.sh -f unique/mnode/mgmt23.sim
-./test.sh -f unique/mnode/mgmt24.sim
-#./test.sh -f unique/mnode/mgmt25.sim
-#./test.sh -f unique/mnode/mgmt26.sim
-./test.sh -f unique/mnode/mgmt33.sim
-./test.sh -f unique/mnode/mgmt34.sim
-./test.sh -f unique/mnode/mgmtr2.sim
-
-
-
-./test.sh -f general/parser/stream_on_sys.sim
-./test.sh -f general/stream/metrics_del.sim
-./test.sh -f general/stream/metrics_n.sim
-./test.sh -f general/stream/metrics_replica1_vnoden.sim
-./test.sh -f general/stream/restart_stream.sim
-./test.sh -f general/stream/stream_3.sim
-./test.sh -f general/stream/stream_restart.sim
-./test.sh -f general/stream/table_1.sim
-./test.sh -f general/stream/table_del.sim
-./test.sh -f general/stream/table_n.sim
-./test.sh -f general/stream/table_replica1_vnoden.sim
-
 ./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
 #./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim
 ./test.sh -f unique/arbitrator/dn3_mn1_full_createTableFail.sim
@@ -79,3 +45,35 @@
 ./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
 ./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
 ./test.sh -f unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
+
+./test.sh -f unique/stable/balance_replica1.sim
+./test.sh -f unique/stable/dnode2_stop.sim
+./test.sh -f unique/stable/dnode2.sim
+./test.sh -f unique/stable/dnode3.sim
+./test.sh -f unique/stable/replica2_dnode4.sim
+./test.sh -f unique/stable/replica2_vnode3.sim
+./test.sh -f unique/stable/replica3_dnode6.sim
+./test.sh -f unique/stable/replica3_vnode3.sim
+
+./test.sh -f unique/mnode/mgmt20.sim
+./test.sh -f unique/mnode/mgmt21.sim
+./test.sh -f unique/mnode/mgmt22.sim
+./test.sh -f unique/mnode/mgmt23.sim
+./test.sh -f unique/mnode/mgmt24.sim
+#./test.sh -f unique/mnode/mgmt25.sim
+#./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt33.sim
+./test.sh -f unique/mnode/mgmt34.sim
+./test.sh -f unique/mnode/mgmtr2.sim
+
+./test.sh -f general/parser/stream_on_sys.sim
+./test.sh -f general/stream/metrics_del.sim
+./test.sh -f general/stream/metrics_n.sim
+./test.sh -f general/stream/metrics_replica1_vnoden.sim
+./test.sh -f general/stream/restart_stream.sim
+./test.sh -f general/stream/stream_3.sim
+./test.sh -f general/stream/stream_restart.sim
+./test.sh -f general/stream/table_1.sim
+./test.sh -f general/stream/table_del.sim
+./test.sh -f general/stream/table_n.sim
+./test.sh -f general/stream/table_replica1_vnoden.sim
--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
@@ -55,7 +55,7 @@ $x = 0
 step1: 
 	$x = $x + 1
 	sleep 1000
-	if $x == 10 then
+	if $x == 40 then
 		return -1
 	endi

@@ -106,63 +106,20 @@ endi

 print ============== step2-1: stop dnode2 for falling disc, then restart dnode2, and check rows
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-
-$loopCnt = 0
-wait_dnode2_offline_0:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
-  return -1
-endi
-sql show dnodes
-if $rows != 2 then
-  sleep 2000
-  goto wait_dnode2_offline_0
-endi
-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
-#$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-#$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-#$dnode5Status = $data4_5
-
-if $dnode2Status != offline then
-  sleep 2000
-  goto wait_dnode2_offline_0
-endi
-
 system sh/exec.sh -n dnode2 -s start

-$loopCnt = 0
-wait_dnode2_reready:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
+$x = 0
+a0: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 40 then
 	  return -1
-endi
-sql show dnodes
-if $rows != 2 then
-  sleep 2000
-  goto wait_dnode2_reready
-endi
-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
-#$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-#$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-#$dnode5Status = $data4_5
-
-if $dnode2Status != ready then
-  sleep 2000
-  goto wait_dnode2_reready
+	endi
+
+sql show vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a0
 endi

 sql select count(*) from $stb
@@ -179,7 +136,7 @@ $x = 0
 step2: 
 	$x = $x + 1
 	sleep 1000
-	if $x == 10 then
+	if $x == 40 then
 		return -1
 	endi

@@ -217,37 +174,18 @@ endi

 print ============== step4: stop dnode2 for checking if sync ok
 system sh/exec.sh -n dnode2 -s stop
-$loopCnt = 0
-wait_dnode2_offline:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
+$x = 0
+a2: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 40 then
 	  return -1
-endi
+	endi

-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode2_offline
-endi
-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
-#$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-#$dnode5Status = $data4_5
-
-if $dnode2Status != offline then
-  sleep 2000
-  goto wait_dnode2_offline
-endi
-if $dnode3Status != ready then
-  sleep 2000
-  goto wait_dnode2_offline
+sql show vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a2
 endi

 # check using select
@@ -260,7 +198,7 @@ endi
 print ============== step5: restart dnode2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
-a2: 
+a3: 
 	$x = $x + 1
 	sleep 1000
 	if $x == 40 then
@@ -270,7 +208,7 @@ a2:
 sql show vgroups 
 print online vnodes $data03
 if $data03 != 2 then
-	goto a2
+	goto a3
 endi

 # check using select
@@ -303,7 +241,7 @@ endi

 sql alter database $db replica 3
 $x = 0
-a3: 
+a4: 
 	$x = $x + 1
 	sleep 1000
 	if $x == 40 then
@@ -313,7 +251,7 @@ a3:
 sql show vgroups 
 print online vnodes $data03
 if $data03 != 3 then
-	goto a3
+	goto a4
 endi

 # check using select
@@ -325,44 +263,8 @@ endi

 print ============== step7: alter replica from 3 to 2, and waiting sync
 sql alter database $db replica 2
-$loopCnt = 0
-wait_vgroups_replic_to_2:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
-  return -1
-endi
-
-sql show vgroups
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1  $data10_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2  $data10_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3  $data10_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4  $data10_4
-#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
-#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
-$thirdDnode_2 = $data8_1 
-$thirdDnode_3 = $data8_2 
-$thirdDnode_4 = $data8_3 
-$thirdDnode_5 = $data8_4 
-
-if $thirdDnode_2 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_2
-endi
-if $thirdDnode_3 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_2
-endi
-if $thirdDnode_4 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_2
-endi
-if $thirdDnode_5 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_2
-endi
-
 $x = 0
-a4: 
+a5: 
 	$x = $x + 1
 	sleep 1000
 	if $x == 40 then
@@ -372,7 +274,7 @@ a4:
 sql show vgroups 
 print online vnodes $data03
 if $data03 != 2 then
-	goto a4
+	goto a5
 endi

 # check using select
@@ -384,86 +286,8 @@ endi

 print ============== step8: alter replica from 2 to 1, and waiting sync
 sql alter database $db replica 1
-sleep 10000
-$loopCnt = 0
-wait_vgroups_replic_to_1:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
-  return -1
-endi
-
-sql show vgroups
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4
-#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
-#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
-$sencodDnode_2 = $data6_1 
-$sencodDnode_3 = $data6_2 
-$sencodDnode_4 = $data6_3 
-$sencodDnode_5 = $data6_4 
-
-if $sencodDnode_2 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_1
-endi
-if $sencodDnode_3 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_1
-endi
-if $sencodDnode_4 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_1
-endi
-if $sencodDnode_5 != null then
-  sleep 2000
-  goto wait_vgroups_replic_to_1
-endi
-
-$loopCnt = 0
-all_dnodes_ready:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
-  return -1
-endi
-
-sql show dnodes
-if $rows != 4 then
-  sleep 2000
-  goto all_dnodes_ready
-endi
-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
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-#$dnode5Status = $data4_5
-
-if $dnode1Status != ready then
-  sleep 2000
-  goto all_dnodes_ready
-endi
-if $dnode2Status != ready then
-  sleep 2000
-  goto all_dnodes_ready
-endi
-if $dnode3Status != ready then
-  sleep 2000
-  goto all_dnodes_ready
-endi
-if $dnode4Status != ready then
-  sleep 2000
-  goto all_dnodes_ready
-endi
-
 $x = 0
-a5: 
+a6: 
 	$x = $x + 1
 	sleep 1000
 	if $x == 40 then
@@ -473,7 +297,7 @@ a5:
 sql show vgroups 
 print online vnodes $data03
 if $data03 != 1 then
-	goto a5
+	goto a6
 endi

 # check using select
@@ -488,43 +312,21 @@ sql drop dnode $hostname2
 sql drop dnode $hostname3
 sleep $sleepTimer

-$loopCnt = 0
-wait_dnode23_dropped:
-$loopCnt = $loopCnt + 1
-if $loopCnt == 10 then 
+$x = 0
+step9: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 40 then
 	  return -1
-endi
+	endi

 sql show dnodes
 if $rows != 2 then
-  sleep 2000
-  goto wait_dnode23_dropped
-endi
-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
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $dnode2Status != null then
-  sleep 2000
-  goto wait_dnode23_dropped
-endi
-if $dnode3Status != null then
-  sleep 2000
-  goto wait_dnode23_dropped
-endi
-if $dnode4Status != ready then
-  return -1
+  goto step9
 endi

 $x = 0
-a6: 
+a7: 
 	$x = $x + 1
 	sleep 1000
 	if $x == 40 then
@@ -534,7 +336,7 @@ a6:
 sql show vgroups 
 print online vnodes $data03
 if $data03 != 1 then
-	goto a6
+	goto a7
 endi

 sleep $sleepTimer  #waiting move vnode from dnode3/dnode3 to dnode4
@@ -544,3 +346,13 @@ print data00 $data00
 if $data00 != $totalRows then
 	return -1
 endi
+
+
+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
--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
@@ -140,3 +140,11 @@ if $data00 != $totalRows then
 	return -1
 endi

+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