diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index aa4eb01eae3a257ecf7d6cdb148cbea3c570eb18..a6ed57568653224fb33ae5be97330f396abc2f82 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2262,7 +2262,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
   strcpy(pObj->sversion, pConnect->serverVersion);
   pObj->writeAuth = pConnect->writeAuth;
   pObj->superAuth = pConnect->superAuth;
-//  taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
+  taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
 
   return 0;
 }
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 3ae30f283d6a21ee16e8b9b9779df528deb352df..270c3810a703edaa8d09e733b685689164248068 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -1,9 +1,3 @@
-
-
-
-
-
-
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
index a7113b45359f6d23ac647b74c5a62bb8419ba423..97d5bb468a4d3e20f5a6715a1de6f117625ddd36 100644
--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -442,19 +442,24 @@ sql reset query cache
 sleep 1000
 
 sql use c_b1_d1
-sql select * from c_b1_t1
+sql select * from c_b1_d1.c_b1_t1
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
 if $rows != 5 then
   return -1
 endi
 
 sql use c_b1_d2
-sql select * from c_b1_t2
-if $rows == 6 then
+sql select * from c_b1_d2.c_b1_t2
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $rows != 6 then
   return -1
 endi
 
 sql use c_b1_d3
-sql select * from c_b1_t3 order by t desc
+sql select * from c_b1_d3.c_b1_t3 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 if $rows != 6 then
   return -1
@@ -464,11 +469,13 @@ if $data01 != 36 then
 endi
 
 sql use c_b1_d4
-sql select * from c_b1_t4 order by t desc
+sql select * from c_b1_d4.c_b1_t4 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 
 sql use c_b1_d5
-sql select * from c_b1_t5 order by t desc
+sql select * from c_b1_d5.c_b1_t5 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 51 then
   return -1
@@ -487,7 +494,8 @@ if $data41 != 55 then
 endi
 
 sql use c_b1_d6
-sql select * from c_b1_t6 order by t desc
+sql select * from c_b1_d6.c_b1_t6 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 61 then
   return -1
@@ -506,7 +514,8 @@ if $data41 != 65 then
 endi
 
 sql use c_b1_d7
-sql select * from c_b1_t7 order by t desc
+sql select * from c_b1_d7.c_b1_t7 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 71 then
   return -1
@@ -525,7 +534,8 @@ if $data41 != 75 then
 endi
 
 sql use c_b1_d8
-sql select * from c_b1_t8 order by t desc
+sql select * from c_b1_d8.c_b1_t8 order by t desc
+print $rows 
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 81 then
   return -1
diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim
deleted file mode 100644
index d9f903d55e271b2ad08ecb1714b7858a7f7d5f88..0000000000000000000000000000000000000000
--- a/tests/script/unique/cluster/balance1_bug.sim
+++ /dev/null
@@ -1,789 +0,0 @@
-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 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 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 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
-
-print ============== step1
-print ========= start dnode1
-system sh/exec_up.sh -n dnode1 -s start
-sql connect
-
-sql create database c_b1_d1 tables 4
-sql use c_b1_d1
-
-sql create table c_b1_t1 (t timestamp, i int)
-sql insert into c_b1_t1 values(now+1s, 15)
-sql insert into c_b1_t1 values(now+2s, 14)
-sql insert into c_b1_t1 values(now+2s, 13)
-sql insert into c_b1_t1 values(now+3s, 12)
-sql insert into c_b1_t1 values(now+4s, 11)
-
-sql create database c_b1_d2 tables 4
-sql use c_b1_d2
-sql create table c_b1_t2 (t timestamp, i int)
-sql insert into c_b1_t2 values(now+1s, 25)
-sql insert into c_b1_t2 values(now+2s, 24)
-sql insert into c_b1_t2 values(now+3s, 23)
-sql insert into c_b1_t2 values(now+4s, 22)
-sql insert into c_b1_t2 values(now+5s, 21)
-
-sql show dnodes
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-  return -1
-endi
-if $dnode2Vnodes != null then
-  return -1
-endi
-
-print ============================== step2
-print ========= start dnode2
-sleep 2000
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
-sleep 5000
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 3 then
-  goto show2
-endi
-if $dnode2Vnodes != 3 then
-  goto show2
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step3
-print ========= add db3
-sql create database c_b1_d3 tables 4
-sql use c_b1_d3
-sql create table c_b1_t3 (t timestamp, i int)
-sql insert into c_b1_t3 values(now+1s, 35)
-sql insert into c_b1_t3 values(now+2s, 34)
-sql insert into c_b1_t3 values(now+3s, 33)
-sql insert into c_b1_t3 values(now+4s, 32)
-sql insert into c_b1_t3 values(now+5s, 31)
-
-print ============================== step4
-print ========= drop dnode2
-sql drop dnode $hostname2
-sleep 9000
-
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show4
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 1 then
-  goto show4
-endi
-if $dnode2Vnodes != null then
-  goto show4
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step5
-print ========= add dnode2
-system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
-system sh/exec_up.sh -n dnode2 -s start
-sql create dnode $hostname2
-sleep 9000
-
-$x = 0
-show5: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show5
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show5
-endi
-if $dnode2Vnodes != 3 then
-  goto show5
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$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_up.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 = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != null then
-  goto show6
-endi
-if $dnode2Vnodes != 1 then
-  goto show6
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step7
-print ========= add dnode1
-sql create dnode $hostname1
-sleep 23000
-system sh/exec_up.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 = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 3 then
-  goto show7
-endi
-if $dnode2Vnodes != 2 then
-  goto show7
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step8
-print ========= drop dnode2
-system sh/exec_up.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
-
-$x = 0
-show8: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show8
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 1 then
-  goto show8
-endi
-if $dnode2Vnodes != null then
-  goto show8
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-
-print ============================== step9
-print ========= add dnode2
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
-sleep 9000
-
-$x = 0
-show9: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show9
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show9
-endi
-if $dnode2Vnodes != 3 then
-  goto show9
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-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)
-sql insert into c_b1_t4 values(now+1s, 45)
-sql insert into c_b1_t4 values(now+2s, 44)
-sql insert into c_b1_t4 values(now+3s, 43)
-sql insert into c_b1_t4 values(now+4s, 42)
-sql insert into c_b1_t4 values(now+5s, 41)
-
-$x = 0
-show10: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show10
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-   goto show10
-endi
-if $dnode2Vnodes != 2 then
-   goto show10
-endi
-
-sql use c_b1_d3
-sql insert into c_b1_t3 values(now+1s, 35)
-
-sql use c_b1_d2
-sql insert into c_b1_t2 values(now+1s, 25)
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_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 = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 0 then
-   goto show11
-endi
-if $dnode2Vnodes != null then
-   goto show11
-endi
-
-sql show mnodes
-$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_up.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:
-
-print ============================== step13
-print ========= add dnode2
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
-sleep 9000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-sql use c_b1_d5;
-$x = 0
-create5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql create table c_b1_t5 (t timestamp, i int) -x create5
-sql insert into c_b1_t5 values(now+1s, 55)
-sql insert into c_b1_t5 values(now+2s, 54)
-sql insert into c_b1_t5 values(now+3s, 53)
-sql insert into c_b1_t5 values(now+4s, 52)
-sql insert into c_b1_t5 values(now+5s, 51)
-
-sql create database c_b1_d6
-sql use c_b1_d6
-$x = 0
-create6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql create table c_b1_t6 (t timestamp, i int)  -x create6
-sql insert into c_b1_t6 values(now+1s, 65)
-sql insert into c_b1_t6 values(now+2s, 64)
-sql insert into c_b1_t6 values(now+3s, 63)
-sql insert into c_b1_t6 values(now+4s, 62)
-sql insert into c_b1_t6 values(now+5s, 61)
-
-sql show dnodes
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_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 = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-sleep 2000
-sql create dnode $hostname3
-system sh/exec_up.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 = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show14
-endi
-if $dnode2Vnodes != 2 then
-  goto show14
-endi
-if $dnode3Vnodes != 2 then
-  goto show14
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-print ============================== step15
-print ========= create db7 db8
-
-sql create database c_b1_d7 tables 4
-sql use c_b1_d7
-sql create table c_b1_t7 (t timestamp, i int)
-sql insert into c_b1_t7 values(now+1s, 75)
-sql insert into c_b1_t7 values(now+2s, 74)
-sql insert into c_b1_t7 values(now+3s, 73)
-sql insert into c_b1_t7 values(now+4s, 72)
-sql insert into c_b1_t7 values(now+5s, 71)
-
-sql create database c_b1_d8
-sql use c_b1_d8
-sql create table c_b1_t8 (t timestamp, i int)
-sql insert into c_b1_t8 values(now+1s, 85)
-sql insert into c_b1_t8 values(now+2s, 84)
-sql insert into c_b1_t8 values(now+3s, 83)
-sql insert into c_b1_t8 values(now+4s, 82)
-sql insert into c_b1_t8 values(now+5s, 81)
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_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_up.sh -n dnode4 -s start
-print sleep 12000
-sleep 12000
-print sleep 12000 over
-
-$x = 0
-show15: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 15 then 
-	  return -1
-	endi
-sql show dnodes -x show15
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show15
-endi
-if $dnode2Vnodes != 2 then
-  goto show15
-endi
-if $dnode3Vnodes != 2 then
-  goto show15
-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(now+1s, 95)
-sql insert into c_b1_t9 values(now+2s, 94)
-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_up.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 = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode1Vnodes != 1 then
-  goto show16
-endi
-if $dnode2Vnodes != 1 then
-  goto show16
-endi
-if $dnode3Vnodes != 1 then
-  goto show16
-endi
-
-print ============================== step17
-print ========= check data
-
-sleep 2000
-
-sql use c_b1_d1
-sql select * from c_b1_t1 order by t desc -x s1
-s1:
-
-sql use c_b1_d2
-sql select * from c_b1_t2 order by t desc -x s2
-print $data01 $data11 $data21 $data31 $data41
-
-if $data01 != 25 then
-  return -1
-endi
-
-if $data11 != 21 then
-  return -1
-endi
-if $data21 != 22 then
-  return -1
-endi
-if $data31 != 23 then
-  return -1
-endi
-if $data41 != 24 then
-  return -1
-endi
-s2:
-
-sql use c_b1_d3
-sql select * from c_b1_t3 order by t desc -x s3
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 35 then
-  return -1
-endi
-s3:
-
-sql use c_b1_d4
-sql select * from c_b1_d4.c_b1_t4 order by t desc -x s4
-print $data01 $data11 $data21 $data31 $data41
-s4:
-
-
-sql use c_b1_d5
-sql select * from c_b1_d5.c_b1_t5 order by t desc -x s5
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 51 then
-  return -1
-endi
-if $data11 != 52 then
-  return -1
-endi
-if $data21 != 53 then
-  return -1
-endi
-if $data31 != 54 then
-  return -1
-endi
-if $data41 != 55 then
-  return -1
-endi
-s5:
-
-sql use c_b1_d6
-sql select * from c_b1_d6.c_b1_t6 order by t desc -x s6
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 61 then
-  return -1
-endi
-if $data11 != 62 then
-  return -1
-endi
-if $data21 != 63 then
-  return -1
-endi
-if $data31 != 64 then
-  return -1
-endi
-if $data41 != 65 then
-  return -1
-endi
-s6:
-
-sql use c_b1_d7
-sql select * from c_b1_d7.c_b1_t7 order by t desc -x s7
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 71 then
-  return -1
-endi
-if $data11 != 72 then
-  return -1
-endi
-if $data21 != 73 then
-  return -1
-endi
-if $data31 != 74 then
-  return -1
-endi
-if $data41 != 75 then
-  return -1
-endi
-s7:
-
-sql use c_b1_d9
-sql select * from c_b1_t9 order by t desc -x s8
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 91 then
-  return -1
-endi
-if $data11 != 92 then
-  return -1
-endi
-if $data21 != 93 then
-  return -1
-endi
-if $data31 != 94 then
-  return -1
-endi
-if $data41 != 95 then
-  return -1
-endi
-s8:
-
-print ============================================ over
-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
deleted file mode 100644
index be46186a595a38e9d91d4423a47b9432fc995ef0..0000000000000000000000000000000000000000
--- a/tests/script/unique/cluster/balance1_single.sim
+++ /dev/null
@@ -1,716 +0,0 @@
-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/deploy.sh -n dnode5 -i 5
-
-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
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1
-
-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 dnode5 -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 clog -v 1
-
-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/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
-
-print ============== step1
-print ========= start dnode1
-system sh/exec_up.sh -n dnode1 -s start
-sleep 3000
-sql connect
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode2Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode3Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show1
-endi
-if $dnode2Vnodes != 4 then
-  goto show1
-endi
-sleep 1000
-
-sql create database c_b1_d1 tables 4
-sql use c_b1_d1
-
-sql create table c_b1_t1 (t timestamp, i int)
-sql insert into c_b1_t1 values(now+1s, 15)
-sql insert into c_b1_t1 values(now+2s, 14)
-sql insert into c_b1_t1 values(now+2s, 13)
-sql insert into c_b1_t1 values(now+3s, 12)
-sql insert into c_b1_t1 values(now+4s, 11)
-
-sql create database c_b1_d2 tables 4
-sql use c_b1_d2
-sql create table c_b1_t2 (t timestamp, i int)
-sql insert into c_b1_t2 values(now+1s, 25)
-sql insert into c_b1_t2 values(now+2s, 24)
-sql insert into c_b1_t2 values(now+3s, 23)
-sql insert into c_b1_t2 values(now+4s, 22)
-sql insert into c_b1_t2 values(now+5s, 21)
-
-sql show dnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 2 then
-  return -1
-endi
-if $dnode3Vnodes != null then
-  return -1
-endi
-
-print ============================== step2
-print ========= start dnode3
-sleep 3000
-sql create dnode $hostname3
-system sh/exec_up.sh -n dnode3 -s start
-sleep 8000
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 3 then
-  goto show2
-endi
-if $dnode3Vnodes != 3 then
-  goto show2
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step3
-print ========= add db3
-sql create database c_b1_d3 tables 4
-sql use c_b1_d3
-sql create table c_b1_t3 (t timestamp, i int)
-sql insert into c_b1_t3 values(now+1s, 35)
-sql insert into c_b1_t3 values(now+2s, 34)
-sql insert into c_b1_t3 values(now+3s, 33)
-sql insert into c_b1_t3 values(now+4s, 32)
-sql insert into c_b1_t3 values(now+5s, 31)
-
-
-print ============================== step4
-print ========= drop dnode3
-sql drop dnode $hostname3
-sleep 9000
-
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show4
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 1 then
-  goto show4
-endi
-if $dnode3Vnodes != null then
-  goto show4
-endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ============================== step5
-print ========= add dnode3
-system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
-sleep 5000
-system sh/exec_up.sh -n dnode3 -s start
-sql create dnode $hostname3
-sleep 9000
-
-$x = 0
-show5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show5
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 2 then
-  goto show5
-endi
-if $dnode3Vnodes != 3 then
-  goto show5
-endi
-
-print ============================== step6
-print ========= drop dnode2
-system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
-print stop dnode2 and sleep 10000
-sleep 10000
-
-sql drop dnode $hostname2
-print drop dnode2 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
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != null then
-  goto show6
-endi
-if $dnode3Vnodes != 1 then
-  goto show6
-endi
-
-#only c_b2_d2 has data, c_b1_d1 and c_b1_d3 is null
-
-print ============================== step7
-print ========= add dnode2
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
-sleep 9000
-
-$x = 0
-show7: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show7
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 3 then
-  goto show7
-endi
-if $dnode3Vnodes != 2 then
-  goto show7
-endi
-
-print ============================== step8
-print ========= drop dnode3
-system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
-print stop dnode3 and sleep 10000
-sleep 10000
-sql drop dnode $hostname3
-print drop dnode3 and sleep 9000
-sleep 9000
-
-$x = 0
-show8: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show8
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 1 then
-  goto show8
-endi
-if $dnode3Vnodes != null then
-  goto show8
-endi
-
-print ============================== step9
-print ========= add dnode3
-sql create dnode $hostname3
-system sh/exec_up.sh -n dnode3 -s start
-sleep 9000
-
-$x = 0
-show9: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show9
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 2 then
-  goto show9
-endi
-if $dnode3Vnodes != 3 then
-  goto show9
-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)
-sql insert into c_b1_t4 values(now+1s, 45)
-sql insert into c_b1_t4 values(now+2s, 44)
-sql insert into c_b1_t4 values(now+3s, 43)
-sql insert into c_b1_t4 values(now+4s, 42)
-sql insert into c_b1_t4 values(now+5s, 41)
-
-$x = 0
-show10: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show10
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 2 then
-   goto show10
-endi
-if $dnode3Vnodes != 2 then
-   goto show10
-endi
-
-sql use c_b1_d3
-sql insert into c_b1_t3 values(now+1s, 35)
-
-sql use c_b1_d2
-sql insert into c_b1_t2 values(now+1s, 25)
-
-print ============================== step11
-print ========= drop dnode3
-sql drop dnode $hostname3
-sleep 9000
-
-$x = 0
-show11: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show11
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-if $dnode2Vnodes != 0 then
-   goto show11
-endi
-if $dnode3Vnodes != null then
-   goto show11
-endi
-
-system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
-
-print ============================== step12
-print ========= add db5
-sql create database c_b1_d5 tables 4
-sql use c_b1_d5
-
-print ============================== step13
-print ========= add dnode3
-sql create dnode $hostname3
-system sh/exec_up.sh -n dnode3 -s start
-sleep 9000
-
-sql use c_b1_d5;
-$x = 0
-create5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql create table c_b1_t5 (t timestamp, i int) -x create5
-sql insert into c_b1_t5 values(now+1s, 55)
-sql insert into c_b1_t5 values(now+2s, 54)
-sql insert into c_b1_t5 values(now+3s, 53)
-sql insert into c_b1_t5 values(now+4s, 52)
-sql insert into c_b1_t5 values(now+5s, 51)
-
-sql create database c_b1_d6 tables 4
-sql use c_b1_d6
-$x = 0
-create6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table c_b1_t6 (t timestamp, i int)  -x create6
-sql insert into c_b1_t6 values(now+1s, 65)
-sql insert into c_b1_t6 values(now+2s, 64)
-sql insert into c_b1_t6 values(now+3s, 63)
-sql insert into c_b1_t6 values(now+4s, 62)
-sql insert into c_b1_t6 values(now+5s, 61)
-
-sql show dnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-
-#if $dnode2Vnodes != 1 then
-#  return -1
-#endi
-#if $dnode3Vnodes != 1 then
-#  return -1
-#endi
-
-print ============================== step14
-print ========= add dnode4
-sql create dnode $hostname4
-system sh/exec_up.sh -n dnode4 -s start
-sleep 10000
-
-$x = 0
-show14: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show14
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode2Vnodes != 2 then
-  goto show14
-endi
-if $dnode3Vnodes != 2 then
-  goto show14
-endi
-if $dnode4Vnodes != 2 then
-  goto show14
-endi
-
-print ============================== step15
-print ========= create db7 db8
-
-sql create database c_b1_d7 tables 4
-sql use c_b1_d7
-sql create table c_b1_t7 (t timestamp, i int)
-sql insert into c_b1_t7 values(now+1s, 75)
-sql insert into c_b1_t7 values(now+2s, 74)
-sql insert into c_b1_t7 values(now+3s, 73)
-sql insert into c_b1_t7 values(now+4s, 72)
-sql insert into c_b1_t7 values(now+5s, 71)
-
-sql create database c_b1_d8 tables 4
-sql use c_b1_d8
-sql create table c_b1_t8 (t timestamp, i int)
-sql insert into c_b1_t8 values(now+1s, 85)
-sql insert into c_b1_t8 values(now+2s, 84)
-sql insert into c_b1_t8 values(now+3s, 83)
-sql insert into c_b1_t8 values(now+4s, 82)
-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_up.sh -n dnode5 -s start
-print sleep 12000
-sleep 12000
-print sleep 12000 over
-
-$x = 0
-show15: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show15
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-$dnode5Vnodes = $data2_5
-print dnode5 $dnode5Vnodes
-
-if $dnode2Vnodes != 2 then
-  goto show15
-endi
-if $dnode3Vnodes != 2 then
-  goto show15
-endi
-if $dnode4Vnodes != 2 then
-  goto show15
-endi
-if $dnode5Vnodes != 2 then
-  goto show15
-endi
-
-print ============================== step16
-print ========= drop dnode5, create db9
-
-sql drop dnode $hostname5
-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(now+1s, 95)
-sql insert into c_b1_t9 values(now+2s, 94)
-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_up.sh -n dnode5 -s stop -x SIGINT
-
-$x = 0
-show16: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 50 then
-	  return -1
-	endi
-sql show dnodes -x show16
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode2Vnodes != 1 then
-  goto show16
-endi
-if $dnode3Vnodes != 1 then
-  goto show16
-endi
-if $dnode4Vnodes != 1 then
-  goto show16
-endi
-
-print ============================== step17
-print ========= check data
-
-sql use c_b1_d1
-sql select * from c_b1_t1
-if $rows != 0 then
-  return -1
-endi
-
-sql use c_b1_d2
-sql select * from c_b1_t2
-if $rows != 6 then
-  return -1
-endi
-
-sql use c_b1_d3
-sql select * from c_b1_t3 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $rows != 1 then
-  return -1
-endi
-if $data01 != 35 then
-  return -1
-endi
-
-sql use c_b1_d4
-sql select * from c_b1_t4 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 41 then
-  return -1
-endi
-if $data11 != 42 then
-  return -1
-endi
-if $data21 != 43 then
-  return -1
-endi
-if $data31 != 44 then
-  return -1
-endi
-if $data41 != 45 then
-  return -1
-endi
-
-sql use c_b1_d5
-sql select * from c_b1_t5 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 51 then
-  return -1
-endi
-if $data11 != 52 then
-  return -1
-endi
-if $data21 != 53 then
-  return -1
-endi
-if $data31 != 54 then
-  return -1
-endi
-if $data41 != 55 then
-  return -1
-endi
-
-sql use c_b1_d6
-sql select * from c_b1_t6 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 61 then
-  return -1
-endi
-if $data11 != 62 then
-  return -1
-endi
-if $data21 != 63 then
-  return -1
-endi
-if $data31 != 64 then
-  return -1
-endi
-if $data41 != 65 then
-  return -1
-endi
-
-sql use c_b1_d7
-sql select * from c_b1_t7 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 71 then
-  return -1
-endi
-if $data11 != 72 then
-  return -1
-endi
-if $data21 != 73 then
-  return -1
-endi
-if $data31 != 74 then
-  return -1
-endi
-if $data41 != 75 then
-  return -1
-endi
-
-sql use c_b1_d8
-sql select * from c_b1_t8 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 81 then
-  return -1
-endi
-if $data11 != 82 then
-  return -1
-endi
-if $data21 != 83 then
-  return -1
-endi
-if $data31 != 84 then
-  return -1
-endi
-if $data41 != 85 then
-  return -1
-endi
-
-sql use c_b1_d9
-sql select * from c_b1_t9 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 91 then
-  return -1
-endi
-if $data11 != 92 then
-  return -1
-endi
-if $data21 != 93 then
-  return -1
-endi
-if $data31 != 94 then
-  return -1
-endi
-if $data41 != 95 then
-  return -1
-endi
-
-
-print ============================================ over
-#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 907b344140e067ca7a8dfab862ad7b2a612428bf..af77db3ce6255d8e890b73a3ad35519a323d58a7 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -128,13 +128,13 @@ print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show2
 endi
 if $dnode2Vnodes != null then
   goto show2
 endi
-if $dnode3Vnodes != 1 then
+if $dnode3Vnodes != 3 then
   goto show2
 endi
 
@@ -151,18 +151,9 @@ print dnode4 ==> $dnode4Role
 system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
 
 print ============================== step3
-print ========= start dnode2
-sql create dnode $hostname2
-
-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
-sleep 3000
-
-system sh/exec_up.sh -n dnode2 -s start
+print ========= start dnode4
+sql create dnode $hostname4
+system sh/exec_up.sh -n dnode4 -s start
 sleep 10000
 
 $x = 0
@@ -175,15 +166,15 @@ show3:
 sql show dnodes -x show3
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show3
 endi
-if $dnode2Vnodes != 2 then
+if $dnode4Vnodes != 2 then
   goto show3
 endi
 if $dnode3Vnodes != 2 then
@@ -200,6 +191,20 @@ print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
 
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
 print ============================== step4
 print ========= drop dnode3
 sql drop dnode $hostname3
@@ -215,15 +220,15 @@ show4:
 sql show dnodes -x show4
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show4
 endi
-if $dnode2Vnodes != 1 then
+if $dnode4Vnodes != 3 then
   goto show4
 endi
 if $dnode3Vnodes != null then
@@ -240,21 +245,26 @@ print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
 
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
 system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
 
 print ============================== step5
 print ========= start dnode3
-sql create dnode $hostname3
-
-sleep 3000
-system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-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_up.sh -n dnode3 -s start
+sql create dnode $hostname5
+system sh/exec_up.sh -n dnode5 -s start
 sleep 9000
 
 $x = 0
@@ -267,33 +277,30 @@ show5:
 sql show dnodes -x show5
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show5
 endi
-if $dnode2Vnodes != 2 then
+if $dnode4Vnodes != 2 then
   goto show5
 endi
-if $dnode3Vnodes != 2 then
+if $dnode5Vnodes != 2 then
   goto show5
 endi
 
 sql show mnodes
 $dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
 $dnode4Role = $data2_4
+$dnode5Role = $data2_5
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
 
 print ============================== step6
-print ========= drop dnode1
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
@@ -302,6 +309,21 @@ sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============================== step6.1
+system sh/exec_up.sh -n dnode1 -s start
+
 $x = 0
 show6: 
 	$x = $x + 1
@@ -312,68 +334,56 @@ show6:
 sql show dnodes -x show6
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != null then
   goto show6
 endi
-if $dnode2Vnodes != 1 then
+if $dnode4Vnodes != 3 then
   goto show6
 endi
-if $dnode3Vnodes != 1 then
+if $dnode5Vnodes != 3 then
   goto show6
 endi
 
 sql show mnodes
 $dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
 $dnode4Role = $data2_4
+$dnode5Role = $data2_5
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 
 print ============================== step7
-print ========= start dnode1
-sql create dnode $hostname1
+print ========= start dnode6
+sql create dnode $hostname6
+system sh/exec_up.sh -n dnode6 -s start
+sleep 9000
 
 sql show mnodes
 $dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
 $dnode4Role = $data2_4
+$dnode5Role = $data2_5
+$dnode6Role = $data2_6
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
-
-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 3000
-
-system sh/exec_up.sh -n dnode1 -s start
-sleep 9000
+print dnode5 ==> $dnode5Role
+print dnode6 ==> $dnode6Role
 
 $x = 0
-
 show7: 
 	sql show mnodes
-	$dnode1Role = $data2_1
-	$dnode2Role = $data2_2
-	$dnode3Role = $data2_3
 	$dnode4Role = $data2_4
-	print dnode1 ==> $dnode1Role
-	print dnode2 ==> $dnode2Role
-	print dnode3 ==> $dnode3Role
+	$dnode5Role = $data2_5
+	$dnode6Role = $data2_6
 	print dnode4 ==> $dnode4Role
+	print dnode5 ==> $dnode5Role
+	print dnode6 ==> $dnode6Role
 
 	$x = $x + 1
 	sleep 2000
@@ -381,20 +391,21 @@ show7:
 	  return -1
 	endi
 sql show dnodes -x show7
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
 
-if $dnode1Vnodes != 2 then
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+
+if $dnode4Vnodes != 2 then
   goto show7
 endi
-if $dnode2Vnodes != 2 then
+if $dnode5Vnodes != 2 then
   goto show7
 endi
-if $dnode3Vnodes != 2 then
+if $dnode6Vnodes != 2 then
   goto show7
 endi
 
@@ -410,19 +421,19 @@ sql insert into c_b2_t4 values(1520000022043, 43)
 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_up.sh -n dnode4 -s start
+sql create dnode $hostname7
+system sh/exec_up.sh -n dnode7 -s start
 sleep 9000
 
 sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
 $dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
+$dnode5Role = $data2_5
+$dnode6Role = $data2_6
+$dnode7Role = $data2_7
 print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+print dnode6 ==> $dnode6Role
+print dnode7 ==> $dnode7Role
 
 $x = 0
 show8: 
@@ -432,154 +443,30 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
 
-if $dnode1Vnodes != 2 then
+if $dnode4Vnodes != 2 then
   goto show8
 endi
-if $dnode2Vnodes != 2 then
+if $dnode5Vnodes != 2 then
   goto show8
 endi
-if $dnode3Vnodes != 2 then
+if $dnode6Vnodes != 2 then
   goto show8
 endi
-if $dnode4Vnodes != 2 then
+if $dnode7Vnodes != 2 then
   goto show8
 endi
 
-print ============================== step9
-print ========= drop dnode1.4
-sql drop dnode $hostname1
-sql drop dnode $hostname4
-sleep 10000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-$x = 0
-show9: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show9
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != null then
-  goto show9
-endi
-if $dnode2Vnodes != 0 then
-  goto show9
-endi
-if $dnode3Vnodes != 0 then
-  goto show9
-endi
-if $dnode4Vnodes != null then
-  goto show9
-endi
-
-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
-sql create dnode $hostname1
-sql create dnode $hostname4
-
-sleep 3000
-system sh/deploy.sh -n dnode1 -i 1
-ssystem 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 3000
-
-sleep 3000
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-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_up.sh -n dnode1 -s start
-system sh/exec_up.sh -n dnode4 -s start
-sleep 10000
-
-$x = 0
-show10: 
-	sql show mnodes
-	$dnode1Role = $data2_1
-	$dnode2Role = $data2_2
-	$dnode3Role = $data2_3
-	$dnode4Role = $data2_4
-	print dnode1 ==> $dnode1Role
-	print dnode2 ==> $dnode2Role
-	print dnode3 ==> $dnode3Role
-	print dnode4 ==> $dnode4Role
-	
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show10
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show10
-endi
-if $dnode2Vnodes != 2 then
-  goto show10
-endi
-if $dnode3Vnodes != 2 then
-  goto show10
-endi
-if $dnode4Vnodes != 2 then
-  goto show10
-endi
-
 print ============================== step11
 
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
 sql create database c_b2_d5 replica 2 tables 4
 sql use c_b2_d5;
 sql create table c_b2_t5 (t timestamp, i int)
@@ -606,43 +493,34 @@ show11:
 	  return -1
 	endi
 sql show dnodes -x show11
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode4Vnodes != 1 then
   goto show11
 endi
-if $dnode2Vnodes != 1 then
+if $dnode5Vnodes != 1 then
   goto show11
 endi
-if $dnode3Vnodes != 1 then
+if $dnode6Vnodes != 1 then
   goto show11
 endi
-if $dnode4Vnodes != 1 then
+if $dnode7Vnodes != 1 then
   goto show11
 endi
 
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
 print ============================== step12
 print ========= check data
 
-sql use c_b2_d1
-sql select * from c_b2_t1 order by t desc
+sql reset query cache
+
+sql select * from c_b2_d1.c_b2_t1 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 11 then
   return -1
@@ -660,8 +538,7 @@ if $data41 != 15 then
   return -1
 endi
 
-sql use c_b2_d2
-sql select * from c_b2_t2 order by t desc
+sql select * from c_b2_d2.c_b2_t2 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 
 #if $data01 != 21 then
@@ -680,8 +557,7 @@ print $data01 $data11 $data21 $data31 $data41
 #  return -1
 #endi
 
-sql use c_b2_d3
-sql select * from c_b2_t3 order by t desc
+sql select * from c_b2_d3.c_b2_t3 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 31 then
   return -1
@@ -699,8 +575,7 @@ if $data41 != 35 then
   return -1
 endi
 
-sql use c_b2_d4
-sql select * from c_b2_t4 order by t desc
+sql select * from c_b2_d4.c_b2_t4 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 41 then
   return -1
@@ -718,8 +593,7 @@ if $data41 != 45 then
   return -1
 endi
 
-sql use c_b2_d5
-sql select * from c_b2_t5 order by t desc
+sql select * from c_b2_d5.c_b2_t5 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 51 then
   return -1
@@ -737,8 +611,7 @@ if $data41 != 55 then
   return -1
 endi
 
-sql use c_b2_d6
-sql select * from c_b2_t6 order by t desc
+sql select * from c_b2_d6.c_b2_t6 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 61 then
   return -1
@@ -756,7 +629,6 @@ if $data41 != 65 then
   return -1
 endi
 
-
 print ============================================ over
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
@@ -766,5 +638,3 @@ 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 76ea380e8e12b9e0621dde2774c89a144e781918..1e66fcf253ffb489aba6f1de6177de888b118a05 100644
--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -1,14 +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
@@ -188,16 +179,8 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
 
 print ============================== step4
-print ========= start dnode2
-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
-sleep 3000
-sql create dnode $hostname2
-system sh/exec_up.sh -n dnode2 -s start
+sql create dnode $hostname5
+system sh/exec_up.sh -n dnode5 -s start
 sleep 10000
 
 $x = 0
@@ -210,14 +193,14 @@ show4:
 sql show dnodes -x show4
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
 
-if $dnode2Vnodes != 2 then
+if $dnode5Vnodes != 2 then
   goto show4
 endi
 
@@ -236,8 +219,8 @@ show5:
 sql show dnodes -x show5
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
@@ -246,7 +229,7 @@ print dnode4 $dnode4Vnodes
 if $dnode1Vnodes != 1 then
   goto show5
 endi
-if $dnode2Vnodes != 1 then
+if $dnode5Vnodes != 1 then
   goto show5
 endi
 if $dnode3Vnodes != null then
@@ -256,20 +239,11 @@ if $dnode4Vnodes != 1 then
   goto show5
 endi
 
-
 system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
 
 print ============================== step6
-print ========= start dnode3
-sleep 3000
-system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-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_up.sh -n dnode3 -s start
+sql create dnode $hostname6
+system sh/exec_up.sh -n dnode6 -s start
 sleep 9000
 
 $x = 0
@@ -282,14 +256,14 @@ show6:
 sql show dnodes -x show6
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
 
-if $dnode3Vnodes != 2 then
+if $dnode6Vnodes != 2 then
   goto show6
 endi
 
@@ -308,20 +282,20 @@ show7:
 sql show dnodes -x show7
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show7
 endi
-if $dnode2Vnodes != 1 then
+if $dnode5Vnodes != 1 then
   goto show7
 endi
-if $dnode3Vnodes != 1 then
+if $dnode6Vnodes != 1 then
   goto show7
 endi
 if $dnode4Vnodes != null then
@@ -331,16 +305,8 @@ endi
 system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
 
 print ============================== step8
-print ========= start dnode4
-sleep 3000
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-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_up.sh -n dnode4 -s start
+sql create dnode $hostname7
+system sh/exec_up.sh -n dnode7 -s start
 sleep 9000
 
 $x = 0
@@ -353,14 +319,14 @@ show8:
 sql show dnodes -x show8
 $dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode4Vnodes != 2 then
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+
+if $dnode7Vnodes != 2 then
   goto show8
 endi
 
@@ -382,39 +348,26 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != null then
-  goto show9
-endi
-if $dnode2Vnodes != 1 then
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+
+if $dnode5Vnodes != 1 then
   goto show9
 endi
-if $dnode3Vnodes != 1 then
+if $dnode6Vnodes != 1 then
   goto show9
 endi
-if $dnode4Vnodes != 1 then
+if $dnode7Vnodes != 1 then
   goto show9
 endi
 
 print ============================== step10
-print ========= start dnode1
-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 3000
-sql create dnode $hostname1
-system sh/exec_up.sh -n dnode1 -s start
+sql create dnode $hostname8
+system sh/exec_up.sh -n dnode8 -s start
 sleep 9000
 
 $x = 0
@@ -425,16 +378,16 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != 2 then
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+$dnode8Vnodes = $data2_8
+print dnode8 $dnode8Vnodes
+
+if $dnode8Vnodes != 2 then
  goto show10
 endi
 
@@ -488,48 +441,15 @@ endi
 #  goto show11
 #endi
 
-print ============================== step12
-print ========= drop dnode1
-sql drop dnode $hostname1
-sleep 10000
-
-$x = 0
-show12: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show12
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
-
-if $dnode1Vnodes != null then
-  goto show12
-endi
-if $dnode2Vnodes != 0 then
-  goto show12
-endi
-if $dnode3Vnodes != 0 then
-  goto show12
-endi
-if $dnode4Vnodes != 0 then
-  goto show12
-endi
-
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 
 print ============================== step13
+sql reset query cache
+sleep 1000
+
 print ========= check data
 
-sql use c_b3_d1
-sql select * from c_b3_t1 order by t desc
+sql select * from c_b3_d1.c_b3_t1 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 11 then
   return -1
@@ -547,8 +467,7 @@ if $data41 != 15 then
   return -1
 endi
 
-sql use c_b3_d2
-sql select * from c_b3_t2 order by t desc
+sql select * from c_b3_d2.c_b3_t2 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 
 if $data01 != 21 then
@@ -567,8 +486,7 @@ if $data41 != 25 then
   return -1
 endi
 
-sql use c_b3_d3
-sql select * from c_b3_t3 order by t desc
+sql select * from c_b3_d3.c_b3_t3 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 31 then
   return -1
@@ -586,8 +504,7 @@ if $data41 != 35 then
   return -1
 endi
 
-sql use c_b3_d4
-sql select * from c_b3_t4 order by t desc
+sql select * from c_b3_d4.c_b3_t4 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 if $data01 != 41 then
   return -1
@@ -615,5 +532,3 @@ 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 74fa2cb2715e28c81106251d3d5e0f815f7abe05..34cdda85dd2e984e509941a97269a984592d4118 100644
--- a/tests/script/unique/cluster/testSuite.sim
+++ b/tests/script/unique/cluster/testSuite.sim
@@ -1,5 +1,3 @@
 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