scripts

6309c8ef · Shengliang Guan · d896fc19 · 6309c8ef · 6309c8ef · 6309c8ef
128 changed file
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java
@@ -208,7 +208,6 @@ public class TDNode {
        setCfgConfig("mnodeEqualVnodeNum", "0");
        setCfgConfig("walLevel", "1");
        setCfgConfig("statusInterval", "1");
-        setCfgConfig("numOfTotalVnodes", "64");
        setCfgConfig("numOfMnodes", "3");
        setCfgConfig("numOfThreadsPerCore", "2.0");
        setCfgConfig("monitor", "0");

--- a/tests/pytest/util/dnodes-no-random-fail.py
+++ b/tests/pytest/util/dnodes-no-random-fail.py
@@ -178,7 +178,6 @@ class TDDnode:
        self.cfg("walLevel", "2")
        self.cfg("fsync", "1000")
        self.cfg("statusInterval", "1")
-        self.cfg("numOfTotalVnodes", "64")
        self.cfg("numOfMnodes", "3")
        self.cfg("numOfThreadsPerCore", "2.0")
        self.cfg("monitor", "0")

--- a/tests/pytest/util/dnodes-random-fail.py
+++ b/tests/pytest/util/dnodes-random-fail.py
@@ -178,7 +178,6 @@ class TDDnode:
        self.cfg("walLevel", "2")
        self.cfg("fsync", "1000")
        self.cfg("statusInterval", "1")
-        self.cfg("numOfTotalVnodes", "64")
        self.cfg("numOfMnodes", "3")
        self.cfg("numOfThreadsPerCore", "2.0")
        self.cfg("monitor", "0")

--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -180,7 +180,6 @@ class TDDnode:
        self.cfg("walLevel", "2")
        self.cfg("fsync", "1000")
        self.cfg("statusInterval", "1")
-        self.cfg("numOfTotalVnodes", "64")
        self.cfg("numOfMnodes", "3")
        self.cfg("numOfThreadsPerCore", "2.0")
        self.cfg("monitor", "0")

--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000

 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/basic.sim
+++ b/tests/script/general/db/basic.sim
@@ -99,9 +99,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, speed int) -x step6
-	return -1
-step6:
+sql create table $tb (ts timestamp, speed int)

 print =============== step7
 $i = 0

--- a/tests/script/general/db/delete.sim
+++ b/tests/script/general/db/delete.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 10
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000


--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sleep 3000

--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 sleep 2000
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -2,10 +2,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
@@ -44,9 +40,6 @@ system sh/stop_dnodes.sh
 sleep 3000

 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect

--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10

 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sleep 3000

--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -2,7 +2,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4

 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/len.sim
+++ b/tests/script/general/db/len.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000

 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/repeat.sim
+++ b/tests/script/general/db/repeat.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4

 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/db/vnodes.sim
+++ b/tests/script/general/db/vnodes.sim
@@ -8,7 +8,6 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 0
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode   -v $maxTables
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
 system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000
 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000
 system sh/cfg.sh -n dnode1 -c maxShellConns       -v 100000

--- a/tests/script/general/parser/bug.sim
+++ b/tests/script/general/parser/bug.sim
@@ -20,7 +20,6 @@ system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
 system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 30000
 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
 system sh/cfg.sh -n dnode1 -c maxShellConns       -v 30000
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v 60

 system sh/exec.sh -n dnode1 -s start
 sql connect

--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -2,7 +2,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

--- a/tests/script/general/stable/disk.sim
+++ b/tests/script/general/stable/disk.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/stable/dnode3.sim
+++ b/tests/script/general/stable/dnode3.sim
@@ -8,10 +8,6 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode3 -c walLevel -v 0
 system sh/cfg.sh -n dnode4 -c walLevel -v 0
-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 maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4

--- a/tests/script/general/stable/metrics.sim
+++ b/tests/script/general/stable/metrics.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/stable/refcount.sim
+++ b/tests/script/general/stable/refcount.sim
@@ -2,7 +2,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/stable/show.sim
+++ b/tests/script/general/stable/show.sim
@@ -2,7 +2,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/exec.sh -n dnode1 -s start

 sleep 3000

--- a/tests/script/general/stable/values.sim
+++ b/tests/script/general/stable/values.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/stable/vnode3.sim
+++ b/tests/script/general/stable/vnode3.sim
 system sh/stop_dnodes.sh

-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/table/delete_reuse1.sim
+++ b/tests/script/general/table/delete_reuse1.sim
@@ -19,11 +19,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/table/delete_reuse2.sim
+++ b/tests/script/general/table/delete_reuse2.sim
@@ -19,11 +19,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
@@ -19,11 +19,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/exec.sh -n dnode1 -s start

 sleep 3000

--- a/tests/script/sh/clear.sh
+++ b/tests/script/sh/clear.sh
@@ -122,7 +122,6 @@ echo "numOfLogLines       100000000"      >> $TAOS_CFG
 echo "mnodeEqualVnodeNum   0"              >> $TAOS_CFG
 echo "clog                0"              >> $TAOS_CFG
 echo "statusInterval      1"              >> $TAOS_CFG
-echo "numOfTotalVnodes    4"              >> $TAOS_CFG
 echo "asyncLog            0"              >> $TAOS_CFG
 echo "numOfMnodes         1"              >> $TAOS_CFG
 echo "locale    en_US.UTF-8"              >> $TAOS_CFG

--- a/tests/script/tmp/http.sim
+++ b/tests/script/tmp/http.sim
@@ -20,11 +20,6 @@ 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 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 http -v 1
 system sh/cfg.sh -n dnode2 -c http -v 1
 system sh/cfg.sh -n dnode3 -c http -v 1

--- a/tests/script/tmp/mnodes.sim
+++ b/tests/script/tmp/mnodes.sim
@@ -16,10 +16,6 @@ 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 numOfTotalVnodes -v 20
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 20
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 20
-
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode2 -c http -v 1
 system sh/cfg.sh -n dnode3 -c http -v 1

--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start

 sleep 3000

--- a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -29,11 +29,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4

--- a/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
@@ -29,12 +29,6 @@ system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 16
 system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 16
 system sh/cfg.sh -n dnode5 -c maxVgroupsPerDb -v 16

-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 maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
@@ -214,7 +208,6 @@ system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
 system sh/cfg.sh -n dnode3 -c walLevel -v 1
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 200
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
@@ -19,10 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
@@ -178,7 +174,6 @@ system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
 system sh/cfg.sh -n dnode4 -c walLevel -v 1
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode4 -c role -v 2
 system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 2
 #system sh/cfg.sh -n dnode2 -c role -v 2
 #system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/insert_duplicationTs.sim
+++ b/tests/script/unique/arbitrator/insert_duplicationTs.sim
@@ -29,11 +29,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 #system sh/cfg.sh -n dnode2 -c role -v 2
 #system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
+++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 8
-
 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

--- a/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_createTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
@@ -19,11 +19,6 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10

-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 role -v 1
 system sh/cfg.sh -n dnode2 -c role -v 2
 system sh/cfg.sh -n dnode3 -c role -v 2

--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000

 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 1000

 system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 1000

 system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 1000

 system sh/deploy.sh -n dnode5 -i 5
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode5 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 1000


--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -8,11 +8,9 @@ $totalRows = $totalVnodes * $maxTables

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c walLevel            -v 2
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes    -v $totalVnodes
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb    -v $totalVnodes



--- a/tests/script/unique/big/restartSpeed.sim
+++ b/tests/script/unique/big/restartSpeed.sim
@@ -8,10 +8,8 @@ $totalRows = $totalVnodes * $maxTables

 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 2
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c walLevel            -v 2
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes    -v $totalVnodes


 print ==========  prepare data

--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -8,15 +8,6 @@ system sh/deploy.sh -n dnode6 -i 6
 system sh/deploy.sh -n dnode7 -i 7
 system sh/deploy.sh -n dnode8 -i 8

-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 dnode6 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4
-
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3

--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -8,15 +8,6 @@ system sh/deploy.sh -n dnode6 -i 6
 system sh/deploy.sh -n dnode7 -i 7
 system sh/deploy.sh -n dnode8 -i 8

-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 dnode6 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4
-
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3

--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -9,15 +9,6 @@ system sh/deploy.sh -n dnode6 -i 6
 system sh/deploy.sh -n dnode7 -i 7
 system sh/deploy.sh -n dnode8 -i 8

-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 dnode6 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4
-
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3

--- a/tests/script/unique/cluster/client1_0.sim
+++ b/tests/script/unique/cluster/client1_0.sim
 #system sh/stop_dnodes.sh
 #system sh/deploy.sh -n dnode1 -i 1
 #system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
-#system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
 #system sh/exec.sh -n dnode1 -s start
 #sql connect
 #$db = db1
@@ -10,10 +9,6 @@
 #$stb = stb1
 #sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))

-
-
-
-
 $tblStart = 0
 $tblEnd = 1000
 $tsStart = 1325347200000  # 2012-01-01 00:00:00.000

--- a/tests/script/unique/cluster/cluster_main.sim
+++ b/tests/script/unique/cluster/cluster_main.sim
@@ -23,12 +23,6 @@ system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode5 -c balanceInterval -v 10

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
-
 system sh/cfg.sh -n dnode1 -c role -v 0
 system sh/cfg.sh -n dnode2 -c role -v 0
 system sh/cfg.sh -n dnode3 -c role -v 0

--- a/tests/script/unique/cluster/cluster_main0.sim
+++ b/tests/script/unique/cluster/cluster_main0.sim
@@ -23,12 +23,6 @@ system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode5 -c balanceInterval -v 10

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
-
 system sh/cfg.sh -n dnode1 -c role -v 0
 system sh/cfg.sh -n dnode2 -c role -v 0
 system sh/cfg.sh -n dnode3 -c role -v 0

--- a/tests/script/unique/cluster/cluster_main1.sim
+++ b/tests/script/unique/cluster/cluster_main1.sim
@@ -23,12 +23,6 @@ system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode5 -c balanceInterval -v 10

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
-
 system sh/cfg.sh -n dnode1 -c role -v 0
 system sh/cfg.sh -n dnode2 -c role -v 0
 system sh/cfg.sh -n dnode3 -c role -v 0

--- a/tests/script/unique/cluster/cluster_main2.sim
+++ b/tests/script/unique/cluster/cluster_main2.sim
@@ -23,12 +23,6 @@ system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode5 -c balanceInterval -v 10

-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
-
 system sh/cfg.sh -n dnode1 -c role -v 0
 system sh/cfg.sh -n dnode2 -c role -v 0
 system sh/cfg.sh -n dnode3 -c role -v 0

--- a/tests/script/unique/cluster/main1_client1_0.sim
+++ b/tests/script/unique/cluster/main1_client1_0.sim
 #system sh/stop_dnodes.sh
 #system sh/deploy.sh -n dnode1 -i 1
-#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
-#system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000\
 #system sh/exec.sh -n dnode1 -s start
 #sql connect
 #$db = db1

--- a/tests/script/unique/cluster/main2_client1_0.sim
+++ b/tests/script/unique/cluster/main2_client1_0.sim
 #system sh/stop_dnodes.sh
 #system sh/deploy.sh -n dnode1 -i 1
 #system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
-#system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
 #system sh/exec.sh -n dnode1 -s start
 #sql connect
 #$db = db1

--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -9,9 +9,6 @@ system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 2
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 2
 system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 2

--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -19,11 +19,6 @@ 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 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 maxVgroupsPerDb -v 8
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 8
 system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 8

--- a/tests/script/unique/db/replica_add12.sim
+++ b/tests/script/unique/db/replica_add12.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect

--- a/tests/script/unique/db/replica_add13.sim
+++ b/tests/script/unique/db/replica_add13.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect

--- a/tests/script/unique/db/replica_add23.sim
+++ b/tests/script/unique/db/replica_add23.sim
@@ -20,11 +20,6 @@ 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 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
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect

--- a/tests/script/unique/db/replica_part.sim
+++ b/tests/script/unique/db/replica_part.sim
@@ -13,9 +13,6 @@ system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
 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 numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4

 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start

--- a/tests/script/unique/db/replica_reduce21.sim
+++ b/tests/script/unique/db/replica_reduce21.sim
--- a/tests/script/unique/db/replica_reduce31.sim
+++ b/tests/script/unique/db/replica_reduce31.sim
--- a/tests/script/unique/db/replica_reduce32.sim
+++ b/tests/script/unique/db/replica_reduce32.sim
--- a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
--- a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
--- a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
--- a/tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
--- a/tests/script/unique/stable/balance_replica1.sim
+++ b/tests/script/unique/stable/balance_replica1.sim
--- a/tests/script/unique/stable/dnode2.sim
+++ b/tests/script/unique/stable/dnode2.sim
--- a/tests/script/unique/stable/dnode2_stop.sim
+++ b/tests/script/unique/stable/dnode2_stop.sim
--- a/tests/script/unique/stable/dnode3.sim
+++ b/tests/script/unique/stable/dnode3.sim
--- a/tests/script/unique/stable/replica2_dnode4.sim
+++ b/tests/script/unique/stable/replica2_dnode4.sim
--- a/tests/script/unique/stable/replica2_vnode3.sim
+++ b/tests/script/unique/stable/replica2_vnode3.sim
--- a/tests/script/unique/stable/replica3_dnode6.sim
+++ b/tests/script/unique/stable/replica3_dnode6.sim
--- a/tests/script/unique/stable/replica3_vnode3.sim
+++ b/tests/script/unique/stable/replica3_vnode3.sim
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
--- a/tests/script/unique/stream/metrics_replica1_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim
--- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
--- a/tests/script/unique/stream/metrics_replica2_dnode3.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim
--- a/tests/script/unique/stream/metrics_replica3_dnode4.sim
+++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
--- a/tests/script/unique/stream/table_replica1_dnode2.sim
+++ b/tests/script/unique/stream/table_replica1_dnode2.sim
--- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
--- a/tests/script/unique/stream/table_replica2_dnode3.sim
+++ b/tests/script/unique/stream/table_replica2_dnode3.sim
--- a/tests/script/unique/stream/table_replica3_dnode4.sim
+++ b/tests/script/unique/stream/table_replica3_dnode4.sim
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim