TD-2500

tests/script/unique/db/replica_add12.sim

@@ -20,6 +20,11 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -89,6 +94,39 @@ sql alter database d1 replica 2
 sql alter database d2 replica 2
 sql alter database d3 replica 2
 sql alter database d4 replica 2
+
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
 sleep 10000
 
 print ======== step3
@@ -161,6 +199,38 @@ print ========= step6
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
 
+$x = 0
+step6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
 sql insert into d1.t1 values(now, 3)
 sql insert into d2.t2 values(now, 3)
 sql insert into d3.t3 values(now, 3)
@@ -206,6 +276,38 @@ print ========= step7
 system sh/exec.sh -n dnode3 -s start
 sleep 5000
 
+$x = 0
+step7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
 sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
 sql insert into d3.t3 values(now, 5)

tests/script/unique/db/replica_add13.sim

@@ -20,6 +20,11 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -73,14 +78,47 @@ sql alter database d1 replica 3
 sql alter database d2 replica 3
 sql alter database d3 replica 3
 sql alter database d4 replica 3
-sleep 10000
+
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sleep 5000
 
 print ======== step3
 $x = 0
 show3: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 10 then 
+	if $x == 20 then 
 		return -1
 	endi
 	
@@ -168,6 +206,39 @@ endi
 print ========= step6
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
+
+$x = 0
+step6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
 
@@ -204,6 +275,39 @@ endi
 print ========= step7
 system sh/exec.sh -n dnode3 -s start
 sleep 5000
+
+$x = 0
+step7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
 sleep 5000
 
@@ -236,6 +340,39 @@ endi
 print ========= step8
 system sh/exec.sh -n dnode4 -s start
 sleep 5000
+
+$x = 0
+step8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
 

tests/script/unique/db/replica_add23.sim

@@ -20,6 +20,11 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -73,6 +78,39 @@ sql alter database d1 replica 3
 sql alter database d2 replica 3
 sql alter database d3 replica 3
 sql alter database d4 replica 3
+
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+	
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto a1
+endi
+
 sleep 10000
 
 print ======== step3
@@ -169,6 +207,39 @@ endi
 print ========= step6
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
+
+$x = 0
+step6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step6
+endi
+
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
 
@@ -201,6 +272,39 @@ endi
 print ========= step7
 system sh/exec.sh -n dnode3 -s start
 sleep 5000
+
+$x = 0
+step7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step7
+endi
+
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
 sleep 5000
 
@@ -233,6 +337,39 @@ endi
 print ========= step8
 system sh/exec.sh -n dnode4 -s start
 sleep 5000
+
+$x = 0
+step8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 3 then
+	goto step8
+endi
+
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
 

tests/script/unique/db/replica_part.sim

@@ -14,6 +14,10 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -66,13 +70,77 @@ sql alter database d2 replica 2
 sql alter database d3 replica 2
 sql alter database d4 replica 2
 
-sleep 5000
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sleep 3000
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
 
 print ========= step3
 system sh/exec.sh -n dnode2 -s start
-sleep 10000
+sleep 5000
+
+$x = 0
+step3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step3
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step3
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step3
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step3
+endi
 
 print ========= step4
 sql insert into d1.t1 values(now, 2)
@@ -120,6 +188,39 @@ s1:
 print ========= step6
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
+
+$x = 0
+step6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step6
+endi
+
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
 
@@ -136,6 +237,38 @@ print ========= step7
 system sh/exec.sh -n dnode3 -s start
 sleep 5000
 
+$x = 0
+step7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto step7
+endi
+
 sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
 sql insert into d3.t3 values(now, 5)

tests/script/unique/db/replica_reduce21.sim

@@ -14,6 +14,11 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -63,7 +68,22 @@ sql create database d5 replica 1
 
 print ========= step3 alter d1
 sql alter database d1 replica 1
-sleep 12000
+sleep 5000
+
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a1
+endi
+
 
 print ========= step4 query d1
 sql insert into d1.t1 values(now, 2)

tests/script/unique/db/replica_reduce31.sim

@@ -14,6 +14,11 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -68,13 +73,64 @@ sql alter database d1 replica 2
 sql alter database d2 replica 2
 sql alter database d3 replica 2
 
-sleep 8000
+$x = 0
+a2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a2
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a2
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a2
+endi
+
+sleep 3000
 
 sql alter database d1 replica 1
 sql alter database d2 replica 1
 sql alter database d3 replica 1
+sleep 5000
 
-sleep 8000
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 1 then
+	goto a1
+endi
 
 print ========= step3
 sql reset query cache

tests/script/unique/db/replica_reduce32.sim

@@ -14,6 +14,11 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 1
+
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -65,6 +70,39 @@ sql alter database d1 replica 2
 sql alter database d2 replica 2
 sql alter database d3 replica 2
 sql alter database d4 replica 2
+
+$x = 0
+a1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show d1.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d2.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d3.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
+sql show d4.vgroups 
+print online vnodes $data03
+if $data03 != 2 then
+	goto a1
+endi
+
 sleep 12000
 
 print ========= step3