diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index 40b4c43fdd..f652c65f56 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -51,18 +51,15 @@
 # number of threads per CPU core
 # numOfThreadsPerCore   1.0
 
-# number of vnodes per core in DNode
-# numOfVnodesPerCore    8
+# number of vgroups per db
+# maxVgroupsPerDb       0
+
+# max number of tables per vnode
+# maxTablesPerVnode     1000000
 
 # the ratio of threads responsible for querying in the total thread
 # ratioOfQueryThreads   0.5
 
-# number of total vnodes in DNode
-# numOfTotalVnodes      0
-
-# max number of tables per vnode
-# maxtablesPerVnode     1000
-
 # interval of check load balance when the management node is in normal operation
 # balanceInterval       300
 
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index fbdfc84f5f..1d9a6a2949 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -68,7 +68,9 @@ extern int64_t tsMaxRetentWindow;
 // db parameters in client
 extern int32_t tsCacheBlockSize;
 extern int32_t tsBlocksPerVnode;
+extern int32_t tsMinTablePerVnode;
 extern int32_t tsMaxTablePerVnode;
+extern int32_t tsTableIncStepPerVnode;
 extern int32_t tsMaxVgroupsPerDb;
 extern int16_t tsDaysPerFile;
 extern int32_t tsDaysToKeep;
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index a8ef3f8e8d..b56e27fae7 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -38,7 +38,7 @@ uint16_t tsDnodeShellPort = 6030;  // udp[6035-6039] tcp[6035]
 uint16_t tsDnodeDnodePort = 6035;  // udp/tcp
 uint16_t tsSyncPort = 6040;
 int32_t  tsStatusInterval = 1;  // second
-int16_t  tsNumOfVnodesPerCore = 8;
+int16_t  tsNumOfVnodesPerCore = 32;
 int16_t  tsNumOfTotalVnodes = TSDB_INVALID_VNODE_NUM;
 int32_t  tsNumOfMnodes = 3;
 int32_t  tsEnableVnodeBak = 1;
@@ -112,7 +112,10 @@ int16_t tsCompression   = TSDB_DEFAULT_COMP_LEVEL;
 int16_t tsWAL           = TSDB_DEFAULT_WAL_LEVEL;
 int32_t tsReplications  = TSDB_DEFAULT_DB_REPLICA_OPTION;
 int32_t tsMaxVgroupsPerDb  = 0;
+int32_t tsMinTablePerVnode = 100;
 int32_t tsMaxTablePerVnode = TSDB_DEFAULT_TABLES;
+int32_t tsTableIncStepPerVnode = TSDB_TABLES_STEP;
+
 // balance
 int32_t tsEnableBalance = 1;
 int32_t tsAlternativeRole = 0;
@@ -389,16 +392,6 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "numOfVnodesPerCore";
-  cfg.ptr = &tsNumOfVnodesPerCore;
-  cfg.valType = TAOS_CFG_VTYPE_INT16;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 1;
-  cfg.maxValue = 64;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
   cfg.option = "numOfTotalVnodes";
   cfg.ptr = &tsNumOfTotalVnodes;
   cfg.valType = TAOS_CFG_VTYPE_INT16;
@@ -622,6 +615,26 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "minTablesPerVnode";
+  cfg.ptr = &tsMinTablePerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TABLES;
+  cfg.maxValue = TSDB_MAX_TABLES;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tableIncStepPerVnode";
+  cfg.ptr = &tsTableIncStepPerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TABLES;
+  cfg.maxValue = TSDB_MAX_TABLES;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "cache";
   cfg.ptr = &tsCacheBlockSize;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
diff --git a/src/dnode/src/dnodePeer.c b/src/dnode/src/dnodePeer.c
index 6ab5188934..18fdb4d090 100644
--- a/src/dnode/src/dnodePeer.c
+++ b/src/dnode/src/dnodePeer.c
@@ -60,7 +60,7 @@ int32_t dnodeInitServer() {
   rpcInit.label        = "DND-S";
   rpcInit.numOfThreads = 1;
   rpcInit.cfp          = dnodeProcessReqMsgFromDnode;
-  rpcInit.sessions     = 100;
+  rpcInit.sessions     = TSDB_MAX_VNODES;
   rpcInit.connType     = TAOS_CONN_SERVER;
   rpcInit.idleTime     = tsShellActivityTimer * 1000;
 
@@ -122,7 +122,7 @@ int32_t dnodeInitClient() {
   rpcInit.label        = "DND-C";
   rpcInit.numOfThreads = 1;
   rpcInit.cfp          = dnodeProcessRspFromDnode;
-  rpcInit.sessions     = 100;
+  rpcInit.sessions     = TSDB_MAX_VNODES;
   rpcInit.connType     = TAOS_CONN_CLIENT;
   rpcInit.idleTime     = tsShellActivityTimer * 1000;
   rpcInit.user         = "t";
diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index 971bd0a110..4eba81e29d 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -70,7 +70,13 @@ int32_t main(int32_t argc, char *argv[]) {
     }
 #endif
 #ifdef TAOS_RANDOM_FILE_FAIL
-    else if (strcmp(argv[i], "--random-file-fail-factor") == 0) {
+    else if (strcmp(argv[i], "--random-file-fail-output") == 0) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
+        taosSetRandomFileFailOutput(argv[++i]);
+      } else {
+        taosSetRandomFileFailOutput(NULL);
+      }
+    } else if (strcmp(argv[i], "--random-file-fail-factor") == 0) {
       if ( (i+1) < argc ) {
         int factor = atoi(argv[i+1]);
         printf("The factor of random failure is %d\n", factor);
diff --git a/src/dnode/src/dnodeVWrite.c b/src/dnode/src/dnodeVWrite.c
index 4a69b525ea..ba36e537a6 100644
--- a/src/dnode/src/dnodeVWrite.c
+++ b/src/dnode/src/dnodeVWrite.c
@@ -234,8 +234,8 @@ static void *dnodeProcessWriteQueue(void *param) {
         pHead->len = pWrite->contLen;
         dDebug("%p, rpc msg:%s will be processed in vwrite queue", pWrite->rpcMsg.ahandle, taosMsg[pWrite->rpcMsg.msgType]);
       } else {
-        dDebug("%p, wal msg:%s will be processed in vwrite queue", pWrite->rpcMsg.ahandle, taosMsg[pWrite->rpcMsg.msgType]);
         pHead = (SWalHead *)item;
+        dTrace("%p, wal msg:%s will be processed in vwrite queue, version:%" PRIu64, pHead, taosMsg[pHead->msgType], pHead->version);
       }
 
       int32_t code = vnodeProcessWrite(pVnode, type, pHead, pRspRet);
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index eb3c3abc84..7fdccfd6d4 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -274,8 +274,8 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_DEFAULT_PAYLOAD_SIZE 5120   // default payload size, greater than PATH_MAX value
 #define TSDB_EXTRA_PAYLOAD_SIZE   128    // extra bytes for auth
 #define TSDB_CQ_SQL_SIZE          1024
-#define TSDB_MAX_VNODES           256
-#define TSDB_MIN_VNODES           50
+#define TSDB_MAX_VNODES           2048
+#define TSDB_MIN_VNODES           256
 #define TSDB_INVALID_VNODE_NUM    0
 
 #define TSDB_DNODE_ROLE_ANY       0
@@ -296,9 +296,9 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_DEFAULT_TOTAL_BLOCKS       4
 
 #define TSDB_MIN_TABLES                 4
-#define TSDB_MAX_TABLES                 5000000
-#define TSDB_DEFAULT_TABLES             200000
-#define TSDB_TABLES_STEP                10000
+#define TSDB_MAX_TABLES                 10000000
+#define TSDB_DEFAULT_TABLES             1000000
+#define TSDB_TABLES_STEP                1000
 
 #define TSDB_MIN_DAYS_PER_FILE          1
 #define TSDB_MAX_DAYS_PER_FILE          3650 
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 07b55b6acb..3503e39d31 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -209,6 +209,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_QRY_NO_DISKSPACE,             0, 0x0702, "query no d
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_OUT_OF_MEMORY,            0, 0x0703, "query out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_APP_ERROR,                0, 0x0704, "query app error")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_DUP_JOIN_KEY,             0, 0x0705, "query duplicated join key")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_EXCEED_TAGS_LIMIT,        0, 0x0706, "query tag conditon too many")
 
 // grant
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED,                0, 0x0800, "grant expired")
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 28661dc1ad..80c4fc95ab 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1740,11 +1740,13 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
         return code;
       }
 
-      if (pMsg->pVgroup == NULL) {
-        pMsg->pVgroup = pVgroup;
-        mnodeIncVgroupRef(pVgroup);
+      if (pMsg->pVgroup != NULL) {
+        mnodeDecVgroupRef(pMsg->pVgroup);
       }
 
+      pMsg->pVgroup = pVgroup;
+      mnodeIncVgroupRef(pVgroup);
+
       mDebug("app:%p:%p, table:%s, allocated in vgroup, vgId:%d sid:%d", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId,
              pVgroup->vgId, sid);
 
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 5658f4bcbf..d48b8997e5 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -323,7 +323,7 @@ static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) {
   if (pDb == NULL) return TSDB_CODE_MND_APP_ERROR;
 
   int32_t minIdPoolSize = TSDB_MAX_TABLES;
-  int32_t maxIdPoolSize = TSDB_MIN_TABLES;
+  int32_t maxIdPoolSize = tsMinTablePerVnode;
   for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
     SVgObj *pVgroup = pDb->vgList[v];
     if (pVgroup == NULL) continue;
@@ -347,10 +347,10 @@ static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) {
 
   // realloc all vgroups in db
   int32_t newIdPoolSize;
-  if (minIdPoolSize * 4 < TSDB_TABLES_STEP) {
+  if (minIdPoolSize * 4 < tsTableIncStepPerVnode) {
     newIdPoolSize = minIdPoolSize * 4;
   } else {
-    newIdPoolSize = ((minIdPoolSize / TSDB_TABLES_STEP) + 1) * TSDB_TABLES_STEP;
+    newIdPoolSize = ((minIdPoolSize / tsTableIncStepPerVnode) + 1) * tsTableIncStepPerVnode;
   }
 
   if (newIdPoolSize > tsMaxTablePerVnode) {
@@ -471,6 +471,8 @@ static int32_t mnodeCreateVgroupCb(SMnodeMsg *pMsg, int32_t code) {
   }
 
   pMsg->expected = pVgroup->numOfVnodes;
+  pMsg->successed = 0;
+  pMsg->received = 0;
   mnodeSendCreateVgroupMsg(pVgroup, pMsg);
 
   return TSDB_CODE_MND_ACTION_IN_PROGRESS;
@@ -836,6 +838,8 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
          pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
          mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
 
+  assert(mnodeMsg->received <= mnodeMsg->expected);
+
   if (mnodeMsg->received != mnodeMsg->expected) return;
 
   if (mnodeMsg->received == mnodeMsg->successed) {
diff --git a/src/query/inc/qUtil.h b/src/query/inc/qUtil.h
index 9b818b367f..8fe3c0f495 100644
--- a/src/query/inc/qUtil.h
+++ b/src/query/inc/qUtil.h
@@ -37,7 +37,7 @@ SWindowResult *getWindowResult(SWindowResInfo *pWindowResInfo, int32_t slot);
 #define curTimeWindow(_winres)  ((_winres)->curIndex)
 bool isWindowResClosed(SWindowResInfo *pWindowResInfo, int32_t slot);
 
-void createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo, size_t interBufSize);
+int32_t createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo, size_t interBufSize);
 
 char *getPosInResultPage(SQueryRuntimeEnv *pRuntimeEnv, int32_t columnIndex, SWindowResult *pResult);
 
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 1d9068be16..a12db2b206 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -2978,16 +2978,23 @@ void switchCtxOrder(SQueryRuntimeEnv *pRuntimeEnv) {
   }
 }
 
-void createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo, size_t interBufSize) {
+int32_t createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo, size_t interBufSize) {
   int32_t numOfCols = pQuery->numOfOutput;
 
   pResultRow->resultInfo = calloc((size_t)numOfCols, sizeof(SResultInfo));
+  if (pResultRow->resultInfo == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
   pResultRow->pos = *posInfo;
 
   char* buf = calloc(1, interBufSize);
+  if (buf == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
 
   // set the intermediate result output buffer
   setWindowResultInfo(pResultRow->resultInfo, pQuery, isSTableQuery, buf);
+  return TSDB_CODE_SUCCESS;
 }
 
 void resetCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
@@ -3368,7 +3375,10 @@ static STableQueryInfo *createTableQueryInfo(SQueryRuntimeEnv *pRuntimeEnv, void
   if (QUERY_IS_INTERVAL_QUERY(pQuery) || pRuntimeEnv->groupbyNormalCol) {
     int32_t initialSize = 16;
     int32_t initialThreshold = 100;
-    initWindowResInfo(&pTableQueryInfo->windowResInfo, pRuntimeEnv, initialSize, initialThreshold, TSDB_DATA_TYPE_INT);
+    int32_t code = initWindowResInfo(&pTableQueryInfo->windowResInfo, pRuntimeEnv, initialSize, initialThreshold, TSDB_DATA_TYPE_INT);
+    if (code != TSDB_CODE_SUCCESS) {
+      return NULL;
+    }
   } else { // in other aggregate query, do not initialize the windowResInfo
   }
 
@@ -4189,7 +4199,10 @@ int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, void *tsdb, int32_t vgId, bo
         type = TSDB_DATA_TYPE_INT;  // group id
       }
 
-      initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, 32, 4096, type);
+      code = initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, 32, 4096, type);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
     }
 
   } else if (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) {
@@ -4206,7 +4219,10 @@ int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, void *tsdb, int32_t vgId, bo
       type = TSDB_DATA_TYPE_TIMESTAMP;
     }
 
-    initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, rows, 4096, type);
+    code = initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, rows, 4096, type);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
   }
 
   if (pQuery->fillType != TSDB_FILL_NONE && !isPointInterpoQuery(pQuery)) {
@@ -5370,6 +5386,7 @@ static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTable
     pExprNode = exprTreeFromBinary(pArithExprInfo->base.arg[0].argValue.pz, pArithExprInfo->base.arg[0].argBytes);
   } CATCH( code ) {
     CLEANUP_EXECUTE();
+    qError("qmsg:%p failed to create arithmetic expression string from:%s, reason: %s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz, tstrerror(code));
     return code;
   } END_TRY
 
@@ -5737,6 +5754,10 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SArray* pTableIdList,
 
     size_t s = taosArrayGetSize(pa);
     SArray* p1 = taosArrayInit(s, POINTER_BYTES);
+    if (p1 == NULL) {
+      goto _cleanup;
+    }
+    taosArrayPush(pQInfo->tableqinfoGroupInfo.pGroupList, &p1);
 
     for(int32_t j = 0; j < s; ++j) {
       void* pTable = taosArrayGetP(pa, j);
@@ -5751,13 +5772,14 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SArray* pTableIdList,
 
       void* buf = pQInfo->pBuf + index * sizeof(STableQueryInfo);
       STableQueryInfo* item = createTableQueryInfo(&pQInfo->runtimeEnv, pTable, window, buf);
+      if (item == NULL) {
+        goto _cleanup;
+      }
       item->groupIndex = i;
       taosArrayPush(p1, &item);
       taosHashPut(pQInfo->tableqinfoGroupInfo.map, &id->tid, sizeof(id->tid), &item, POINTER_BYTES);
       index += 1;
     }
-
-    taosArrayPush(pQInfo->tableqinfoGroupInfo.pGroupList, &p1);
   }
 
   pQInfo->arrTableIdInfo = taosArrayInit(tableIndex, sizeof(STableIdInfo));
@@ -6104,6 +6126,9 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, vo
       code = tsdbQuerySTableByTagCond(tsdb, id->uid, tagCond, pQueryMsg->tagCondLen, pQueryMsg->tagNameRelType, tbnameCond, &tableGroupInfo, pGroupColIndex,
                                           numOfGroupByCols);
       if (code != TSDB_CODE_SUCCESS) {
+        if (code == TSDB_CODE_QRY_EXCEED_TAGS_LIMIT) {
+          qError("qmsg:%p failed to QueryStable, reason: %s", pQueryMsg, tstrerror(code));
+        }
         goto _over;
       }
     } else {
diff --git a/src/query/src/qUtil.c b/src/query/src/qUtil.c
index dce2c24ea0..acdc46fcc1 100644
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
@@ -50,9 +50,15 @@ int32_t initWindowResInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRun
   
   // use the pointer arraylist
   pWindowResInfo->pResult = calloc(threshold, sizeof(SWindowResult));
+  if (pWindowResInfo->pResult == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
   for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
     SPosInfo posInfo = {-1, -1};
-    createQueryResultInfo(pRuntimeEnv->pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, &posInfo, pRuntimeEnv->interBufSize);
+    int32_t code = createQueryResultInfo(pRuntimeEnv->pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, &posInfo, pRuntimeEnv->interBufSize);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
   }
   
   return TSDB_CODE_SUCCESS;
@@ -76,9 +82,11 @@ void cleanupTimeWindowInfo(SWindowResInfo *pWindowResInfo, int32_t numOfCols) {
     return;
   }
   
-  for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
-    SWindowResult *pResult = &pWindowResInfo->pResult[i];
-    destroyTimeWindowRes(pResult, numOfCols);
+  if (pWindowResInfo->pResult != NULL) {
+    for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
+      SWindowResult *pResult = &pWindowResInfo->pResult[i];
+      destroyTimeWindowRes(pResult, numOfCols);
+    }
   }
   
   taosHashCleanup(pWindowResInfo->hashList);
diff --git a/src/query/src/qast.c b/src/query/src/qast.c
index ffd339f111..c5f4a9ce6c 100644
--- a/src/query/src/qast.c
+++ b/src/query/src/qast.c
@@ -962,10 +962,13 @@ static UNUSED_FUNC char* exception_strdup(const char* str) {
 
 static tExprNode* exprTreeFromBinaryImpl(SBufferReader* br) {
   int32_t anchor = CLEANUP_GET_ANCHOR();
+  if (CLEANUP_EXCEED_LIMIT()) {
+    THROW(TSDB_CODE_QRY_EXCEED_TAGS_LIMIT);
+    return NULL;
+  }
 
   tExprNode* pExpr = exception_calloc(1, sizeof(tExprNode));
   CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, pExpr, NULL);
-
   pExpr->nodeType = tbufReadUint8(br);
   
   if (pExpr->nodeType == TSQL_NODE_VALUE) {
@@ -995,7 +998,6 @@ static tExprNode* exprTreeFromBinaryImpl(SBufferReader* br) {
     pExpr->_node.hasPK = tbufReadUint8(br);
     pExpr->_node.pLeft = exprTreeFromBinaryImpl(br);
     pExpr->_node.pRight = exprTreeFromBinaryImpl(br);
-    
     assert(pExpr->_node.pLeft != NULL && pExpr->_node.pRight != NULL);
   }
   
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index c055a27c39..9e5da903b1 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -2217,7 +2217,8 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, const char* pT
 
   } CATCH( code ) {
     CLEANUP_EXECUTE();
-    ret = code;
+    terrno = code;
+    goto _error; 
     // TODO: more error handling
   } END_TRY
 
diff --git a/src/util/inc/exception.h b/src/util/inc/exception.h
index 52cd03d830..38f94bfe28 100644
--- a/src/util/inc/exception.h
+++ b/src/util/inc/exception.h
@@ -78,6 +78,7 @@ void cleanupPush_int_ptr        ( bool failOnly, void* func, void* arg );
 int32_t cleanupGetActionCount();
 void cleanupExecuteTo( int32_t anchor, bool failed );
 void cleanupExecute( SExceptionNode* node, bool failed );
+bool cleanupExceedLimit();
 
 #define CLEANUP_PUSH_VOID_PTR_PTR( failOnly, func, arg1, arg2 )  cleanupPush_void_ptr_ptr( (failOnly), (void*)(func), (void*)(arg1), (void*)(arg2) )
 #define CLEANUP_PUSH_VOID_PTR_BOOL( failOnly, func, arg1, arg2 ) cleanupPush_void_ptr_bool( (failOnly), (void*)(func), (void*)(arg1), (bool)(arg2) )
@@ -91,7 +92,7 @@ void cleanupExecute( SExceptionNode* node, bool failed );
 
 #define CLEANUP_GET_ANCHOR()          cleanupGetActionCount()
 #define CLEANUP_EXECUTE_TO( anchor, failed )  cleanupExecuteTo( (anchor), (failed) )
-
+#define CLEANUP_EXCEED_LIMIT()        cleanupExceedLimit() 
 
 ////////////////////////////////////////////////////////////////////////////////
 // functions & macros for exception handling
diff --git a/src/util/inc/tfile.h b/src/util/inc/tfile.h
index 04e500743c..de52a40967 100644
--- a/src/util/inc/tfile.h
+++ b/src/util/inc/tfile.h
@@ -19,13 +19,14 @@
 #ifdef TAOS_RANDOM_FILE_FAIL
 
 void taosSetRandomFileFailFactor(int factor);
-ssize_t taos_tread(int fd, void *buf, size_t count);
-ssize_t taos_twrite(int fd, void *buf, size_t count);
-off_t taos_lseek(int fd, off_t offset, int whence);
+void taosSetRandomFileFailOutput(const char *path);
+ssize_t taos_tread(int fd, void *buf, size_t count, const char *file, uint32_t line);
+ssize_t taos_twrite(int fd, void *buf, size_t count, const char *file, uint32_t line);
+off_t taos_lseek(int fd, off_t offset, int whence, const char *file, uint32_t line);
 
-#define tread(fd, buf, count)  taos_tread(fd, buf, count)
-#define twrite(fd, buf, count)  taos_twrite(fd, buf, count)
-#define lseek(fd, offset, whence)  taos_lseek(fd, offset, whence)
+#define tread(fd, buf, count)  taos_tread(fd, buf, count, __FILE__, __LINE__)
+#define twrite(fd, buf, count)  taos_twrite(fd, buf, count, __FILE__, __LINE__)
+#define lseek(fd, offset, whence)  taos_lseek(fd, offset, whence, __FILE__, __LINE__)
 
 #endif  // TAOS_RANDOM_FILE_FAIL
 
diff --git a/src/util/src/exception.c b/src/util/src/exception.c
index e1f6516fe7..0b716b6aba 100644
--- a/src/util/src/exception.c
+++ b/src/util/src/exception.c
@@ -147,3 +147,6 @@ void cleanupExecuteTo( int32_t anchor, bool failed ) {
 void cleanupExecute( SExceptionNode* node, bool failed ) {
     doExecuteCleanup( node, 0, failed );
 }
+bool cleanupExceedLimit() {
+  return expList->numCleanupAction >= expList->maxCleanupAction;
+}
diff --git a/src/util/src/tfile.c b/src/util/src/tfile.c
index 92eeaef126..d1a9c24615 100644
--- a/src/util/src/tfile.c
+++ b/src/util/src/tfile.c
@@ -29,14 +29,55 @@
 #ifdef TAOS_RANDOM_FILE_FAIL
 
 static int random_file_fail_factor = 20;
+static FILE *fpRandomFileFailOutput = NULL;
 
 void taosSetRandomFileFailFactor(int factor)
 {
   random_file_fail_factor = factor;
 }
+
+static void close_random_file_fail_output()
+{
+  if (fpRandomFileFailOutput != NULL) {
+    if (fpRandomFileFailOutput != stdout) {
+      fclose(fpRandomFileFailOutput);
+    }
+    fpRandomFileFailOutput = NULL;
+  }
+}
+
+static void random_file_fail_output_sig(int sig)
+{
+  fprintf(fpRandomFileFailOutput, "signal %d received.\n", sig);
+
+  struct sigaction act = {0};
+  act.sa_handler = SIG_DFL;
+  sigaction(sig, &act, NULL);
+
+  close_random_file_fail_output();
+  exit(EXIT_FAILURE);
+}
+
+void taosSetRandomFileFailOutput(const char *path)
+{
+  if (path == NULL) {
+    fpRandomFileFailOutput = stdout;
+  } else if ((fpRandomFileFailOutput = fopen(path, "w")) != NULL) {
+    atexit(close_random_file_fail_output);
+  } else {
+    printf("failed to open random file fail log file '%s', errno=%d\n", path, errno);
+    return;
+  }
+
+  struct sigaction act = {0};
+  act.sa_handler = random_file_fail_output_sig;
+  sigaction(SIGFPE, &act, NULL);
+  sigaction(SIGSEGV, &act, NULL);
+  sigaction(SIGILL, &act, NULL);
+}
 #endif
 
-ssize_t taos_tread(int fd, void *buf, size_t count)
+ssize_t taos_tread(int fd, void *buf, size_t count, const char *file, uint32_t line)
 {
 #ifdef TAOS_RANDOM_FILE_FAIL
   if (random_file_fail_factor > 0) {
@@ -49,7 +90,7 @@ ssize_t taos_tread(int fd, void *buf, size_t count)
   return tread(fd, buf, count);
 }
 
-ssize_t taos_twrite(int fd, void *buf, size_t count)
+ssize_t taos_twrite(int fd, void *buf, size_t count, const char *file, uint32_t line)
 {
 #ifdef TAOS_RANDOM_FILE_FAIL
   if (random_file_fail_factor > 0) {
@@ -62,7 +103,7 @@ ssize_t taos_twrite(int fd, void *buf, size_t count)
   return twrite(fd, buf, count);
 }
 
-off_t taos_lseek(int fd, off_t offset, int whence)
+off_t taos_lseek(int fd, off_t offset, int whence, const char *file, uint32_t line)
 {
 #ifdef TAOS_RANDOM_FILE_FAIL
   if (random_file_fail_factor > 0) {
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 695a55d476..01e423e5ec 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -59,7 +59,7 @@ int32_t vnodeInitResources() {
   vnodeInitWriteFp();
   vnodeInitReadFp();
 
-  tsDnodeVnodesHash = taosHashInit(TSDB_MAX_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true);
+  tsDnodeVnodesHash = taosHashInit(TSDB_MIN_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true);
   if (tsDnodeVnodesHash == NULL) {
     vError("failed to init vnode list");
     return TSDB_CODE_VND_OUT_OF_MEMORY;
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index ff58e219b0..4c7970076c 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -155,7 +155,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
   pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
   pRetrieve->free = htons(pRetrieve->free);
 
-  vDebug("vgId:%d, QInfo:%p, retrieve msg is disposed", pVnode->vgId, *(void**) pRetrieve->qhandle);
+  vDebug("vgId:%d, QInfo:%p, retrieve msg is disposed", pVnode->vgId, (void*) pRetrieve->qhandle);
 
   memset(pRet, 0, sizeof(SRspRet));
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a6070a2fc1..4e7e9a87ea 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,3 +12,4 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
 ADD_SUBDIRECTORY(examples/c)
 ADD_SUBDIRECTORY(tsim)
 ADD_SUBDIRECTORY(test/c)
+ADD_SUBDIRECTORY(comparisonTest/tdengine)
diff --git a/tests/comparisonTest/tdengine/CMakeLists.txt b/tests/comparisonTest/tdengine/CMakeLists.txt
new file mode 100644
index 0000000000..ccdeefcdaf
--- /dev/null
+++ b/tests/comparisonTest/tdengine/CMakeLists.txt
@@ -0,0 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
+INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  add_executable(tdengineTest tdengineTest.c)
+  target_link_libraries(tdengineTest taos_static tutil common pthread)
+ENDIF()
diff --git a/tests/comparisonTest/tdengine/tdengineTest.c b/tests/comparisonTest/tdengine/tdengineTest.c
index a2b048214f..de92526337 100644
--- a/tests/comparisonTest/tdengine/tdengineTest.c
+++ b/tests/comparisonTest/tdengine/tdengineTest.c
@@ -7,6 +7,7 @@
 #include <time.h>
 #include <pthread.h>
 #include <sys/time.h>
+#include <inttypes.h>
 
 typedef struct {
   char sql[256];
@@ -123,19 +124,21 @@ void writeDataImp(void *param) {
   if (taos == NULL)
     taos_error(taos);
 
-  int code = taos_query(taos, "use db");
+  TAOS_RES* result = taos_query(taos, "use db");
+  int32_t code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
-  char sql[65000];
+  char *sql = calloc(1, 8*1024*1024);
   int sqlLen = 0;
   int lastMachineid = 0;
   int counter = 0;
   int totalRecords = 0;
 
   for (int j = pThread->sID; j <= pThread->eID; j++) {
-    char fileName[256];
+    char fileName[300];
     sprintf(fileName, "%s/testdata%d.csv", arguments.dataDir, j);
 
     FILE *fp = fopen(fileName, "r");
@@ -162,7 +165,7 @@ void writeDataImp(void *param) {
       int64_t timestamp;
       int temperature;
       float humidity;
-      sscanf(line, "%d%s%d%lld%d%f", &machineid, machinename, &machinegroup, &timestamp, &temperature, &humidity);
+      sscanf(line, "%d%s%d%" PRId64 "%d%f", &machineid, machinename, &machinegroup, &timestamp, &temperature, &humidity);
 
       if (counter == 0) {
         sqlLen = sprintf(sql, "insert into");
@@ -174,14 +177,16 @@ void writeDataImp(void *param) {
                           machineid, machineid, machinename, machinegroup);
       }
 
-      sqlLen += sprintf(sql + sqlLen, "(%lld,%d,%f)", timestamp, temperature, humidity);
+      sqlLen += sprintf(sql + sqlLen, "(%" PRId64 ",%d,%f)", timestamp, temperature, humidity);
       counter++;
 
       if (counter >= arguments.rowsPerRequest) {
-        int code = taos_query(taos, sql);
+        TAOS_RES *result = taos_query(taos, sql);
+        int32_t   code = taos_errno(result);
         if (code != 0) {
-          printf("thread:%d error:%d reason:%s\n", pThread->pid, code, taos_errstr(taos));
+          printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
         }
+        taos_free_result(result);
 
         totalRecords += counter;
         counter = 0;
@@ -194,15 +199,18 @@ void writeDataImp(void *param) {
   }
 
   if (counter > 0) {
-    int code = taos_query(taos, sql);
+    TAOS_RES *result = taos_query(taos, sql);
+    int32_t   code = taos_errno(result);
     if (code != 0) {
-      printf("thread:%d error:%d reason:%s\n", pThread->pid, code, taos_errstr(taos));
+      printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
     }
+    taos_free_result(result);
 
     totalRecords += counter;
   }
 
   __sync_fetch_and_add(&statis.totalRows, totalRecords);
+  free(sql);
 }
 
 void writeData() {
@@ -215,19 +223,23 @@ void writeData() {
   taos_init();
 
   void *taos = taos_connect("127.0.0.1", "root", "taosdata", NULL, 0);
-  if (taos == NULL)
-    taos_error(taos);
+  if (taos == NULL) taos_error(taos);
 
-  int code = taos_query(taos, "create database if not exists db");
+  TAOS_RES *result = taos_query(taos, "create database if not exists db");
+  int32_t   code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
-  code = taos_query(taos, "create table if not exists db.devices(ts timestamp, temperature int, humidity float) "
-    "tags(devid int, devname binary(16), devgroup int)");
+  result = taos_query(taos,
+                      "create table if not exists db.devices(ts timestamp, temperature int, humidity float) "
+                      "tags(devid int, devname binary(16), devgroup int)");
+  code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
   int64_t st = getTimeStampMs();
 
@@ -292,17 +304,12 @@ void readData() {
 
     int64_t st = getTimeStampMs();
 
-    int code = taos_query(taos, line);
+    TAOS_RES *result = taos_query(taos, line);
+    int32_t   code = taos_errno(result);
     if (code != 0) {
       taos_error(taos);
     }
 
-    void *result = taos_use_result(taos);
-    if (result == NULL) {
-      printf("failed to get result, reason:%s\n", taos_errstr(taos));
-      exit(1);
-    }
-
     TAOS_ROW row;
     int rows = 0;
     //int num_fields = taos_field_count(taos);
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 0341b3f136..b67f509cc6 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -28,7 +28,9 @@ class TDSimClient:
             "locale": "en_US.UTF-8",
             "charset": "UTF-8",
             "asyncLog": "0",
-            "maxTablesPerVnode": "4",
+            "minTablesPerVnode": "4",
+            "maxTablesPerVnode": "1000",
+            "tableIncStepPerVnode": "10000",
             "maxVgroupsPerDb": "1000",
             "sdbDebugFlag": "143",
             "rpcDebugFlag": "135",
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 5573db0739..cbc6edb831 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -139,7 +139,9 @@ echo "clog                2"              >> $TAOS_CFG
 echo "statusInterval      1"              >> $TAOS_CFG
 echo "numOfTotalVnodes    4"              >> $TAOS_CFG
 echo "maxVgroupsPerDb     4"              >> $TAOS_CFG
+echo "minTablesPerVnode   4"              >> $TAOS_CFG
 echo "maxTablesPerVnode   1000"           >> $TAOS_CFG
+echo "tableIncStepPerVnode 10000"         >> $TAOS_CFG
 echo "asyncLog            0"              >> $TAOS_CFG
 echo "numOfMnodes         1"              >> $TAOS_CFG
 echo "locale    en_US.UTF-8"              >> $TAOS_CFG
diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim
index 85146bd4c3..459f6e7665 100644
--- a/tests/script/tmp/prepare.sim
+++ b/tests/script/tmp/prepare.sim
@@ -25,10 +25,15 @@ 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 dnode4 -c numOfTotalVnodes -v 20
 
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 20
-system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 20
-system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 20
-system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 20
+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
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 2
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 100000
 
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode2 -c http -v 1
diff --git a/tests/script/unique/cluster/client3.sim b/tests/script/unique/cluster/client3.sim
new file mode 100644
index 0000000000..4b3024f881
--- /dev/null
+++ b/tests/script/unique/cluster/client3.sim
@@ -0,0 +1,55 @@
+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+loop_lable:
+print ====================== client3 start loop: dynamic create table and insert data, select, drop table ............
+
+$totalRows = 0
+
+#sql create table $stb ( ts timestamp, c1 int) tags ( t1 int, t2 binary(16) )
+$tagBinary = ' . client3
+$tagBinary = $tagBinary . '
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb using $stb tags ( $i , $tagBinary ) values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x  
+#  print ====== app insert totalRows: $totalRows  
+  $i = $i + 1
+endw 
+   
+sql select count(*) from $stb where t2 == $tagBinary
+if $data00 != $totalRows then
+  print data00 $data00 totalRows $totalRows
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client3   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+print ====================== client3 drop table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql drop table if exists $tb 
+  $i = $i + 1
+endw 
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/client4.sim b/tests/script/unique/cluster/client4.sim
new file mode 100644
index 0000000000..a4c347695e
--- /dev/null
+++ b/tests/script/unique/cluster/client4.sim
@@ -0,0 +1,113 @@
+$tblStart = 0
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+loop_lable:
+print ====================== client4 start loop: create db2, tables and insert data, select, drop db2 ............
+
+$db = db2
+$stb = stb2
+
+print create database if not exists $db replica 2
+sql create database if not exists $db replica 2
+sql use $db
+
+print ==== client4start create table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql create table $tb (ts timestamp, c1 int)
+  $i = $i + 1
+endw 
+
+
+print ==== client4start insert, include multi table data in one insert sql
+$totalRows = 0
+$totalRowsPerTbl = 0
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+
+print ====client4 start alter table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql alter table $tb add c2 float
+  $i = $i + 1
+endw 
+
+print ====client4 continue insert, include multi table data in one insert sql
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+print ====================== client4 drop database
+sql drop if exists database $db 
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/client5.sim b/tests/script/unique/cluster/client5.sim
new file mode 100644
index 0000000000..5960b28fdd
--- /dev/null
+++ b/tests/script/unique/cluster/client5.sim
@@ -0,0 +1,113 @@
+$tblStart = 0
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+loop_lable:
+print ====================== client5 start loop query
+
+$db = db2
+$stb = stb2
+
+print create database if not exists $db replica 2
+sql create database if not exists $db replica 2
+sql use $db
+
+print ==== client4start create table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql create table $tb (ts timestamp, c1 int)
+  $i = $i + 1
+endw 
+
+
+print ==== client4start insert, include multi table data in one insert sql
+$totalRows = 0
+$totalRowsPerTbl = 0
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+
+print ====client4 start alter table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql alter table $tb add c2 float
+  $i = $i + 1
+endw 
+
+print ====client4 continue insert, include multi table data in one insert sql
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+print ====================== client4 drop database
+sql drop if exists database $db 
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/cluster_main.sim b/tests/script/unique/cluster/cluster_main.sim
index 236f1aa59a..4c02d416f3 100644
--- a/tests/script/unique/cluster/cluster_main.sim
+++ b/tests/script/unique/cluster/cluster_main.sim
@@ -71,7 +71,7 @@ print ============== step3: create stable stb1
 $stb = stb1
 sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
 
-print ============== step4: start 10 client1/ 10 client2/ 10 client3/ 10 client4/ 1 client5
+print ============== step4: start back client1_0.sim
 run_back unique/cluster/client1_0.sim
 #run_back unique/cluster/client1_1.sim
 #run_back unique/cluster/client1_2.sim
@@ -106,27 +106,43 @@ endi
 print wait for a while to let clients start insert data
 sleep 5000    
 
-$loop_cnt = 0
-loop_cluster_do:
-print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready
-system sh/exec.sh -n dnode4 -s start
-system sh/exec.sh -n dnode5 -s start
+print ============== step4-1: add dnode4/dnode5 into cluster
 sql create dnode $hostname4
 sql create dnode $hostname5
 
-sleep 5000
-
-
-print ============== step6: stop and drop dnode1, then remove data dir of dnode1 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
-sql drop dnode $hostname1
-sleep 5000
-
-system rm -rf ../../../sim/dnode1/data
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
 sleep 20000
 
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
 sql show mnodes
 print show mnodes
 print rows: $rows
@@ -139,7 +155,6 @@ print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
 print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
 print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
-return -1
 
 print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
@@ -236,14 +251,17 @@ if $data04 != 2 then
   return -1
 endi
 
-print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 
+print ============== step14: stop dnode4/dnode5
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
 system sh/exec.sh -n dnode5 -s stop -x SIGINT
 sleep 20000
-sql drop dnode $hostname4
-sql drop dnode $hostname5
-system rm -rf ../../../sim/dnode4/data
-system rm -rf ../../../sim/dnode5/data
+#system sh/exec.sh -n dnode4 -s start
+#system sh/exec.sh -n dnode5 -s start
+#sleep 10000
+#sql drop dnode $hostname4
+#sql drop dnode $hostname5
+#system rm -rf ../../../sim/dnode4/data
+#system rm -rf ../../../sim/dnode5/data
 
 print ============== step15: alter replica 1
 sql alter database $db replica 1
@@ -263,13 +281,13 @@ if $data04 != 2 then
   return -1
 endi
 
-print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
-system sh/cfg.sh -n dnode1 -c first -v $hostname2
-system sh/cfg.sh -n dnode1 -c second -v $hostname3
-
-system sh/exec.sh -n dnode1 -s start
-sql create dnode $hostname1
-sleep 20000
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
 
 print ============== step18: alter replica 3
 sql alter database $db replica 3
diff --git a/tests/script/unique/cluster/cluster_main0.sim b/tests/script/unique/cluster/cluster_main0.sim
new file mode 100644
index 0000000000..f3cce9fd45
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main0.sim
@@ -0,0 +1,288 @@
+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 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 dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+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 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 alternativeRole -v 0
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$db = db1
+print create database $db replica 3
+#sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 3
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/client1_0.sim
+run_back unique/cluster/client1_1.sim
+run_back unique/cluster/client1_2.sim
+run_back unique/cluster/client1_3.sim
+#run_back unique/cluster/client2_0.sim
+#run_back unique/cluster/client2_1.sim
+#run_back unique/cluster/client2_2.sim
+#run_back unique/cluster/client2_3.sim
+#run_back unique/cluster/client3.sim
+#run_back unique/cluster/client4.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sql create dnode $hostname4
+sql create dnode $hostname5
+
+sleep 5000
+
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+print ============== step12: restart dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 3000
+sql drop dnode $hostname4
+sql drop dnode $hostname5
+system rm -rf ../../../sim/dnode4/data
+system rm -rf ../../../sim/dnode5/data
+sleep 20000
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/cluster_main1.sim b/tests/script/unique/cluster/cluster_main1.sim
new file mode 100644
index 0000000000..82e1e2be83
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main1.sim
@@ -0,0 +1,329 @@
+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 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 dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+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 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 alternativeRole -v 0
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$replica = 3
+$db = db1
+print create database $db replica $replica
+#sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica $replica
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/main1_client1_0.sim
+run_back unique/cluster/main1_client1_1.sim
+run_back unique/cluster/main1_client1_2.sim
+run_back unique/cluster/main1_client1_3.sim
+run_back unique/cluster/client3.sim
+run_back unique/cluster/client4.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+print ============== step4-1: add dnode4/dnode5 into cluster
+sql create dnode $hostname4
+sql create dnode $hostname5
+sleep 5000
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sleep 20000
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+#print ============== step12: restart dnode4, then wait sync end
+#system sh/exec.sh -n dnode4 -s start
+#sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: stop dnode5
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+#print ============== step14-1: drop dnode5, then remove data dir
+#sql drop dnode $hostname5
+#sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/cluster_main2.sim b/tests/script/unique/cluster/cluster_main2.sim
new file mode 100644
index 0000000000..e5fe3f2a21
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main2.sim
@@ -0,0 +1,333 @@
+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 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 dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+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 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 alternativeRole -v 0
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$replica = 3
+$db = db1
+print create database $db replica $replica
+#sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica $replica
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/main2_client1_0.sim
+run_back unique/cluster/main2_client1_1.sim
+run_back unique/cluster/main2_client1_2.sim
+run_back unique/cluster/main2_client1_3.sim
+run_back unique/cluster/main2_client2_0.sim
+run_back unique/cluster/main2_client2_1.sim
+run_back unique/cluster/main2_client2_2.sim
+run_back unique/cluster/main2_client2_3.sim
+run_back unique/cluster/client3.sim
+run_back unique/cluster/client4.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+print ============== step4-1: add dnode4/dnode5 into cluster
+sql create dnode $hostname4
+sql create dnode $hostname5
+sleep 5000
+
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+#print ============== step12: restart dnode4, then wait sync end
+#system sh/exec.sh -n dnode4 -s start
+#sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: drop dnode5, then remove data dir
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+#print ============== step14-1: drop dnode5, then remove data dir
+#sql drop dnode $hostname5
+#sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/main1_client1_0.sim b/tests/script/unique/cluster/main1_client1_0.sim
new file mode 100644
index 0000000000..d4f2aa4294
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_0.sim
@@ -0,0 +1,94 @@
+#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
+#sql create database $db
+#sql use $db
+#$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
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_0 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_0 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_0 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_0 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_0  insert data complete once ............
+  endi
+endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_1.sim b/tests/script/unique/cluster/main1_client1_1.sim
new file mode 100644
index 0000000000..b50f533ce1
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_1.sim
@@ -0,0 +1,82 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_1 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_1 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_1 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_1 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_2.sim b/tests/script/unique/cluster/main1_client1_2.sim
new file mode 100644
index 0000000000..8cc39ded04
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_2.sim
@@ -0,0 +1,81 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_2 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_2 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_2 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_2 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_3.sim b/tests/script/unique/cluster/main1_client1_3.sim
new file mode 100644
index 0000000000..72e1be48ac
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_3.sim
@@ -0,0 +1,81 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_3 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_3 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_3 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_3 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_3  insert data complete once ............
+  endi
+endw 
+print ====================== client1_3  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client4.sim b/tests/script/unique/cluster/main1_client4.sim
new file mode 100644
index 0000000000..eb8049b04b
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client4.sim
@@ -0,0 +1,127 @@
+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db2
+$stb = stb2
+
+loop_lable:
+print ========= start loop create db, table, inset data, alter column/tag, select, drop db
+
+sql create database if not exists $db
+sql use $db
+sql create table if not exists $stb ( ts timestamp, c1 int, c2 float ) tags ( t1 int , t2 binary(16) )
+$tagBinary = ' . client4
+$tagBinary = $tagBinary . '
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  sql create table if not exists  $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+##################### alter column
+sql alter table $stb add column c3 double
+sql alter table $stb drop column c2
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+
+##################### alter tag
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t2
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = ttb . $i
+  sql create table if not exists  $tb using $stb tags ($i, $i)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_0.sim b/tests/script/unique/cluster/main2_client1_0.sim
new file mode 100644
index 0000000000..a7fd181363
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_0.sim
@@ -0,0 +1,69 @@
+#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
+#sql create database $db
+#sql use $db
+#$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
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_0  insert data complete once ............
+  endi
+endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_1.sim b/tests/script/unique/cluster/main2_client1_1.sim
new file mode 100644
index 0000000000..f22d62a741
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_1.sim
@@ -0,0 +1,57 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_1  insert data complete once ............
+  endi
+endw 
+print ====================== client1_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_2.sim b/tests/script/unique/cluster/main2_client1_2.sim
new file mode 100644
index 0000000000..df3a925c59
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_2.sim
@@ -0,0 +1,56 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_3.sim b/tests/script/unique/cluster/main2_client1_3.sim
new file mode 100644
index 0000000000..9c22432fa5
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_3.sim
@@ -0,0 +1,56 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_3  insert data complete once ............
+  endi
+endw 
+print ====================== client1_3  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_0.sim b/tests/script/unique/cluster/main2_client2_0.sim
new file mode 100644
index 0000000000..e44efc49fc
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_0.sim
@@ -0,0 +1,56 @@
+$tblStart = 0
+$tblEnd = 1000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.001
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_0  insert data complete once ............
+  endi
+endw 
+print ====================== client2_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_1.sim b/tests/script/unique/cluster/main2_client2_1.sim
new file mode 100644
index 0000000000..19de147d3e
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_1.sim
@@ -0,0 +1,57 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_1  insert data complete once ............
+  endi
+endw 
+print ====================== client2_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_2.sim b/tests/script/unique/cluster/main2_client2_2.sim
new file mode 100644
index 0000000000..19e3540bd1
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_2.sim
@@ -0,0 +1,57 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_2  insert data complete once ............
+  endi
+endw 
+print ====================== client2_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_3.sim b/tests/script/unique/cluster/main2_client2_3.sim
new file mode 100644
index 0000000000..219df131c8
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_3.sim
@@ -0,0 +1,57 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_3  insert data complete once ............
+  endi
+endw 
+print ====================== client2_3  success and auto end =====================
\ No newline at end of file