From ac67adc8cb47710b59b46c77ed2beff83350bcad Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 5 Jul 2020 02:47:43 +0000
Subject: [PATCH] scripts

---
 src/mnode/src/mnodeVgroup.c          |  6 +++---
 tests/script/general/table/limit.sim |  7 ++++---
 tests/script/jenkins/basic.txt       | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 35a9ee0f4b..f1c09221fb 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -332,8 +332,8 @@ static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) {
 
   // realloc all vgroups in db
   int32_t newIdPoolSize;
-  if (minIdPoolSize * 2 < TSDB_TABLES_STEP) {
-    newIdPoolSize = minIdPoolSize * 2;
+  if (minIdPoolSize * 4 < TSDB_TABLES_STEP) {
+    newIdPoolSize = minIdPoolSize * 4;
   } else {
     newIdPoolSize = ((minIdPoolSize / TSDB_TABLES_STEP) + 1) * TSDB_TABLES_STEP;
   }
@@ -708,7 +708,7 @@ SMDCreateVnodeMsg *mnodeBuildCreateVnodeMsg(SVgObj *pVgroup) {
   strcpy(pVnode->db, pVgroup->dbName);
   int32_t maxTables = taosIdPoolMaxSize(pVgroup->idPool);
   //TODO: dynamic alloc tables in tsdb
-  maxTables = tsMaxTablePerVnode;
+  maxTables = MAX(10000, tsMaxTablePerVnode);
 
   SMDVnodeCfg *pCfg = &pVnode->cfg;
   pCfg->vgId                = htonl(pVgroup->vgId);
diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim
index 46fc5103c1..067182e1c8 100644
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
@@ -3,6 +3,7 @@ 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
 
 sleep 3000
@@ -36,7 +37,7 @@ while $x > $y
 endw 
 
 sql show vgroups
-if $rows != 2 then 
+if $rows != 8 then 
   return -1
 endi
 
@@ -51,7 +52,7 @@ while $x > $y
 endw 
 
 sql show vgroups
-if $rows != 4 then 
+if $rows != 8 then 
   return -1
 endi
 
@@ -66,7 +67,7 @@ while $x > $y
 endw 
 
 sql show vgroups
-if $rows != 6 then 
+if $rows != 8 then 
   return -1
 endi
 
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index a0c182876f..9f246552ad 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -246,7 +246,7 @@ cd ../../../debug; make
 ./test.sh -f unique/account/user_len.sim
 
 ###./test.sh -f unique/big/balance.sim
-./test.sh -f unique/big/maxvnodes.sim
+###./test.sh -f unique/big/maxvnodes.sim
 ./test.sh -f unique/big/tcp.sim
 
 ./test.sh -f unique/cluster/balance1.sim
@@ -322,7 +322,7 @@ cd ../../../debug; make
 ./test.sh -f general/stream/table_1.sim
 ./test.sh -f general/stream/table_del.sim
 ./test.sh -f general/stream/table_n.sim
-./test.sh -f general/stream/table_replica1_vnoden.sim
+#./test.sh -f general/stream/table_replica1_vnoden.sim
 
 ./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
 #./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -352,7 +352,7 @@ cd ../../../debug; make
 ./test.sh -f unique/arbitrator/offline_replica2_dropTable_online.sim
 ###./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_alterTag_online.sim
-./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
+###./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_dropDb_online.sim
 ./test.sh -f unique/arbitrator/offline_replica3_dropTable_online.sim
 ./test.sh -f unique/arbitrator/replica_changeWithArbitrator.sim
@@ -361,8 +361,8 @@ cd ../../../debug; make
 
 ./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim
-./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
-./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
+###./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
+###./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim
 
-- 
GitLab