Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli

bab592e0 · Minghao Li · fc08a35f · 9381411b · bab592e0 · bab592e0
30 changed file
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -73,7 +73,7 @@ cp ${compile_dir}/../include/client/taos.h          ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../include/common/taosdef.h       ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../include/util/taoserror.h       ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../include/libs/function/taosudf.h       ${pkg_dir}${install_home_path}/include
-cp ${compile_dir}/../src/inc/taosws.h               ${pkg_dir}${install_home_path}/include ||:
+cp ${compile_dir}/build/include/taosws.h            ${pkg_dir}${install_home_path}/include ||:
 cp -r ${top_dir}/examples/*                         ${pkg_dir}${install_home_path}/examples
 #cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
 #cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector

--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -80,7 +80,7 @@ cp %{_compiledir}/../include/client/taos.h          %{buildroot}%{homepath}/incl
 cp %{_compiledir}/../include/common/taosdef.h       %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/util/taoserror.h       %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/libs/function/taosudf.h       %{buildroot}%{homepath}/include
-cp %{_compiledir}/../src/inc/taosws.h               %{buildroot}%{homepath}/include ||:
+cp %{_compiledir}/build/include/taosws.h            %{buildroot}%{homepath}/include ||:
 #cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
 #cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
 #cp -r %{_compiledir}/../src/connector/nodejs        %{buildroot}%{homepath}/connector

--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -229,13 +229,13 @@ function install_lib() {
  ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
  ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
-  ${csudo}ln -s ${lib_link_dir}/libtaosws.so ${lib_link_dir}/libtaosws.so || :
+  [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || :
  if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
    ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
    ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
-    ${csudo}ln -s ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
+    ${csudo}ln -s ${install_main_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
  fi
  ${csudo}ldconfig

--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -116,6 +116,7 @@ function install_bin() {
 function clean_lib() {
    sudo rm -f /usr/lib/libtaos.* || :
+    sudo rm -f /usr/lib/libtaosws.* || :
    sudo rm -rf ${lib_dir} || :
 }
@@ -123,6 +124,9 @@ function install_lib() {
    # Remove links
    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws.*       || :
    #${csudo}rm -rf ${v15_java_app_dir}              || :
    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
@@ -131,13 +135,19 @@ function install_lib() {
        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so
        if [ -d "${lib64_link_dir}" ]; then
            ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
            ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+            [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.so ${lib64_link_dir}/libtaosws.so       || :
        fi
    else
        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        [ -f ${install_main_dir}/driver/libtaosws.dylib ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.dylib ${lib_link_dir}/libtaosws.dylib
    fi
    if [ "$osType" != "Darwin" ]; then
@@ -154,6 +164,8 @@ function install_header() {
    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
    ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h    
+    [ -f ${install_main_dir}/include/taosws.h ] && ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taos.h
 }
 function install_jemalloc() {

--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -57,12 +57,16 @@ if [ "$osType" != "Darwin" ]; then
        ${script_dir}/get_client.sh"
  fi
  lib_files="${build_dir}/lib/libtaos.so.${version}"
+  wslib_files="${build_dir}/lib/libtaosws.so"
 else
  bin_files="${build_dir}/bin/${clientName} ${script_dir}/remove_client.sh"
  lib_files="${build_dir}/lib/libtaos.${version}.dylib"
+  wslib_files="${build_dir}/lib/libtaosws.dylib"
 fi
 header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/libs/function/taosudf.h"
+wsheader_files="${build_dir}/include/taosws.h"
 if [ "$dbName" != "taos" ]; then
  cfg_dir="${top_dir}/../enterprise/packaging/cfg"
 else
@@ -74,6 +78,8 @@ install_files="${script_dir}/install_client.sh"
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
+[ -f ${wsheader_files} ] && cp ${wsheader_files} ${install_dir}/inc
 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${configFile}
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
@@ -187,6 +193,7 @@ cp ${lib_files} ${install_dir}/driver
 # Copy connector
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
+[ -f ${wslib_files} ] && cp ${wslib_files} ${install_dir}/driver
 if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
  if [ "$osType" != "Darwin" ]; then

--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -96,7 +96,7 @@ lib_files="${build_dir}/lib/libtaos.so.${version}"
 wslib_files="${build_dir}/lib/libtaosws.so."
 header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/libs/function/taosudf.h"
-wsheader_files="${code_dir}/inc/taosws.h"
+wsheader_files="${build_dir}/include/taosws.h"
 if [ "$dbName" != "taos" ]; then
  cfg_dir="${top_dir}/../enterprise/packaging/cfg"
@@ -114,7 +114,7 @@ init_file_rpm=${script_dir}/../rpm/taosd
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-${wsheader_files} ${install_dir}/inc || :
+[ -f ${wsheader_files} ] && cp ${wsheader_files} ${install_dir}/inc || :
 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${configFile}

--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -82,22 +82,33 @@ function kill_taosd() {
 function install_include() {
    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
+    ${csudo}rm -f ${inc_link_dir}/taosws.h
    ${csudo}ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h
    ${csudo}ln -s ${inc_dir}/taosdef.h ${inc_link_dir}/taosdef.h
    ${csudo}ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h
    ${csudo}ln -s ${inc_dir}/taosudf.h ${inc_link_dir}/taosudf.h    
+    [ -f ${inc_dir}/taosws.h ] && ${csudo}ln -s ${inc_dir}/taosudf.h ${inc_link_dir}/taosudf.h ||:
 }
 function install_lib() {
    ${csudo}rm -f ${lib_link_dir}/libtaos* || :
    ${csudo}rm -f ${lib64_link_dir}/libtaos* || :
+    ${csudo}rm -f ${lib_link_dir}/libtaosws* || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaosws* || :
    ${csudo}ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1
    ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    [ -f ${lib_dir}/libtaosws.so ]${csudo}ln -s ${lib_dir}/libtaosws.so ${lib_link_dir}/libtaosws.so
    if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
      ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
      ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
+      [ -ff ${lib_dir}/libtaosws.so ] && ${csudo}ln -s ${lib_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so           || :
    fi
    ${csudo}ldconfig

--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
@@ -35,6 +35,46 @@
 extern "C" {
 #endif
+typedef enum {
+  MND_OPER_CONNECT = 1,
+  MND_OPER_CREATE_ACCT,
+  MND_OPER_DROP_ACCT,
+  MND_OPER_ALTER_ACCT,
+  MND_OPER_CREATE_USER,
+  MND_OPER_DROP_USER,
+  MND_OPER_ALTER_USER,
+  MND_OPER_CREATE_BNODE,
+  MND_OPER_DROP_BNODE,
+  MND_OPER_CREATE_DNODE,
+  MND_OPER_DROP_DNODE,
+  MND_OPER_CONFIG_DNODE,
+  MND_OPER_CREATE_MNODE,
+  MND_OPER_DROP_MNODE,
+  MND_OPER_CREATE_QNODE,
+  MND_OPER_DROP_QNODE,
+  MND_OPER_CREATE_SNODE,
+  MND_OPER_DROP_SNODE,
+  MND_OPER_REDISTRIBUTE_VGROUP,
+  MND_OPER_MERGE_VGROUP,
+  MND_OPER_SPLIT_VGROUP,
+  MND_OPER_BALANCE_VGROUP,
+  MND_OPER_CREATE_FUNC,
+  MND_OPER_DROP_FUNC,
+  MND_OPER_KILL_TRANS,
+  MND_OPER_KILL_CONN,
+  MND_OPER_KILL_QUERY,
+  MND_OPER_CREATE_DB,
+  MND_OPER_ALTER_DB,
+  MND_OPER_DROP_DB,
+  MND_OPER_COMPACT_DB,
+  MND_OPER_TRIM_DB,
+  MND_OPER_USE_DB,
+  MND_OPER_WRITE_DB,
+  MND_OPER_READ_DB,
+  MND_OPER_READ_OR_WRITE_DB,
+  MND_OPER_SHOW_VARIBALES,
+} EOperType;
 typedef enum {
  MND_AUTH_ACCT_START = 0,
  MND_AUTH_ACCT_USER,
@@ -109,9 +149,9 @@ typedef struct {
  ETrnPolicy     policy;
  ETrnConflct    conflict;
  ETrnExec       exec;
+  EOperType      oper;
  int32_t        code;
  int32_t        failedTimes;
-  SRpcHandleInfo rpcInfo;
  void*          rpcRsp;
  int32_t        rpcRspLen;
  int32_t        redoActionPos;
@@ -130,6 +170,7 @@ typedef struct {
  int32_t        stopFunc;
  int32_t        paramLen;
  void*          param;
+  SArray*        pRpcArray;
 } STrans;
 typedef struct {

--- a/source/dnode/mnode/impl/inc/mndPrivilege.h
+++ b/source/dnode/mnode/impl/inc/mndPrivilege.h
@@ -22,46 +22,6 @@
 extern "C" {
 #endif
-typedef enum {
-  MND_OPER_CONNECT = 1,
-  MND_OPER_CREATE_ACCT,
-  MND_OPER_DROP_ACCT,
-  MND_OPER_ALTER_ACCT,
-  MND_OPER_CREATE_USER,
-  MND_OPER_DROP_USER,
-  MND_OPER_ALTER_USER,
-  MND_OPER_CREATE_BNODE,
-  MND_OPER_DROP_BNODE,
-  MND_OPER_CREATE_DNODE,
-  MND_OPER_DROP_DNODE,
-  MND_OPER_CONFIG_DNODE,
-  MND_OPER_CREATE_MNODE,
-  MND_OPER_DROP_MNODE,
-  MND_OPER_CREATE_QNODE,
-  MND_OPER_DROP_QNODE,
-  MND_OPER_CREATE_SNODE,
-  MND_OPER_DROP_SNODE,
-  MND_OPER_REDISTRIBUTE_VGROUP,
-  MND_OPER_MERGE_VGROUP,
-  MND_OPER_SPLIT_VGROUP,
-  MND_OPER_BALANCE_VGROUP,
-  MND_OPER_CREATE_FUNC,
-  MND_OPER_DROP_FUNC,
-  MND_OPER_KILL_TRANS,
-  MND_OPER_KILL_CONN,
-  MND_OPER_KILL_QUERY,
-  MND_OPER_CREATE_DB,
-  MND_OPER_ALTER_DB,
-  MND_OPER_DROP_DB,
-  MND_OPER_COMPACT_DB,
-  MND_OPER_TRIM_DB,
-  MND_OPER_USE_DB,
-  MND_OPER_WRITE_DB,
-  MND_OPER_READ_DB,
-  MND_OPER_READ_OR_WRITE_DB,
-  MND_OPER_SHOW_VARIBALES,
-} EOperType;
 int32_t mndInitPrivilege(SMnode *pMnode);
 void    mndCleanupPrivilege(SMnode *pMnode);

--- a/source/dnode/mnode/impl/inc/mndTrans.h
+++ b/source/dnode/mnode/impl/inc/mndTrans.h
@@ -73,12 +73,14 @@ void    mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen);
 void    mndTransSetCb(STrans *pTrans, ETrnFunc startFunc, ETrnFunc stopFunc, void *param, int32_t paramLen);
 void    mndTransSetDbName(STrans *pTrans, const char *dbname1, const char *dbname2);
 void    mndTransSetSerial(STrans *pTrans);
+void    mndTransSetOper(STrans *pTrans, EOperType oper);
 int32_t mndTransPrepare(SMnode *pMnode, STrans *pTrans);
 int32_t mndTransProcessRsp(SRpcMsg *pRsp);
 void    mndTransPullup(SMnode *pMnode);
 int32_t mndKillTrans(SMnode *pMnode, STrans *pTrans);
 void    mndTransExecute(SMnode *pMnode, STrans *pTrans);
+int32_t mndSetRpcInfoForDbTrans(SMnode *pMnode, SRpcMsg *pMsg, EOperType oper, const char *dbname);
 #ifdef __cplusplus
 }

--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -487,6 +487,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SRpcMsg *pReq, SCreateDbReq *pCreate,
  mDebug("trans:%d, used to create db:%s", pTrans->id, pCreate->db);
  mndTransSetDbName(pTrans, dbObj.name, NULL);
+  mndTransSetOper(pTrans, MND_OPER_CREATE_DB);
  if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
  if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
  if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
@@ -534,6 +535,14 @@ static int32_t mndProcessCreateDbReq(SRpcMsg *pReq) {
      terrno = TSDB_CODE_MND_DB_ALREADY_EXIST;
      goto _OVER;
    }
+  } else if (terrno == TSDB_CODE_SDB_OBJ_CREATING) {
+    if (mndSetRpcInfoForDbTrans(pMnode, pReq, MND_OPER_CREATE_DB, createReq.db) == 0) {
+      mDebug("db:%s, is creating and response after trans finished", createReq.db);
+      code = TSDB_CODE_ACTION_IN_PROGRESS;
+      goto _OVER;
+    } else {
+      goto _OVER;
+    }
  } else if (terrno != TSDB_CODE_MND_DB_NOT_EXIST) {
    goto _OVER;
  }

--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -122,6 +122,10 @@ static SSdbRaw *mndTransActionEncode(STrans *pTrans) {
  SDB_SET_INT8(pRaw, dataPos, pTrans->policy, _OVER)
  SDB_SET_INT8(pRaw, dataPos, pTrans->conflict, _OVER)
  SDB_SET_INT8(pRaw, dataPos, pTrans->exec, _OVER)
+  SDB_SET_INT8(pRaw, dataPos, pTrans->oper, _OVER)
+  SDB_SET_INT8(pRaw, dataPos, 0, _OVER)
+  SDB_SET_INT8(pRaw, dataPos, 0, _OVER)
+  SDB_SET_INT8(pRaw, dataPos, 0, _OVER)
  SDB_SET_INT64(pRaw, dataPos, pTrans->createdTime, _OVER)
  SDB_SET_BINARY(pRaw, dataPos, pTrans->dbname1, TSDB_DB_FNAME_LEN, _OVER)
  SDB_SET_BINARY(pRaw, dataPos, pTrans->dbname2, TSDB_DB_FNAME_LEN, _OVER)
@@ -269,15 +273,22 @@ static SSdbRow *mndTransActionDecode(SSdbRaw *pRaw) {
  int8_t policy = 0;
  int8_t conflict = 0;
  int8_t exec = 0;
+  int8_t oper = 0;
+  int8_t reserved = 0;
  int8_t actionType = 0;
  SDB_GET_INT8(pRaw, dataPos, &stage, _OVER)
  SDB_GET_INT8(pRaw, dataPos, &policy, _OVER)
  SDB_GET_INT8(pRaw, dataPos, &conflict, _OVER)
  SDB_GET_INT8(pRaw, dataPos, &exec, _OVER)
+  SDB_GET_INT8(pRaw, dataPos, &oper, _OVER)
+  SDB_GET_INT8(pRaw, dataPos, &reserved, _OVER)
+  SDB_GET_INT8(pRaw, dataPos, &reserved, _OVER)
+  SDB_GET_INT8(pRaw, dataPos, &reserved, _OVER)
  pTrans->stage = stage;
  pTrans->policy = policy;
  pTrans->conflict = conflict;
  pTrans->exec = exec;
+  pTrans->oper = oper;
  SDB_GET_INT64(pRaw, dataPos, &pTrans->createdTime, _OVER)
  SDB_GET_BINARY(pRaw, dataPos, pTrans->dbname1, TSDB_DB_FNAME_LEN, _OVER)
  SDB_GET_BINARY(pRaw, dataPos, pTrans->dbname2, TSDB_DB_FNAME_LEN, _OVER)
@@ -495,6 +506,10 @@ static void mndTransDropData(STrans *pTrans) {
    mndTransDropActions(pTrans->commitActions);
    pTrans->commitActions = NULL;
  }
+  if (pTrans->pRpcArray != NULL) {
+    taosArrayDestroy(pTrans->pRpcArray);
+    pTrans->pRpcArray = NULL;
+  }
  if (pTrans->rpcRsp != NULL) {
    taosMemoryFree(pTrans->rpcRsp);
    pTrans->rpcRsp = NULL;
@@ -585,14 +600,18 @@ STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, ETrnConflct conflict,
  pTrans->redoActions = taosArrayInit(TRANS_ARRAY_SIZE, sizeof(STransAction));
  pTrans->undoActions = taosArrayInit(TRANS_ARRAY_SIZE, sizeof(STransAction));
  pTrans->commitActions = taosArrayInit(TRANS_ARRAY_SIZE, sizeof(STransAction));
+  pTrans->pRpcArray = taosArrayInit(1, sizeof(SRpcHandleInfo));
-  if (pTrans->redoActions == NULL || pTrans->undoActions == NULL || pTrans->commitActions == NULL) {
+  if (pTrans->redoActions == NULL || pTrans->undoActions == NULL || pTrans->commitActions == NULL ||
+      pTrans->pRpcArray == NULL) {
    terrno = TSDB_CODE_OUT_OF_MEMORY;
    mError("failed to create transaction since %s", terrstr());
    return NULL;
  }
-  if (pReq != NULL) pTrans->rpcInfo = pReq->info;
+  if (pReq != NULL) {
+    taosArrayPush(pTrans->pRpcArray, &pReq->info);
+  }
  mTrace("trans:%d, local object is created, data:%p", pTrans->id, pTrans);
  return pTrans;
 }
@@ -677,6 +696,31 @@ void mndTransSetCb(STrans *pTrans, ETrnFunc startFunc, ETrnFunc stopFunc, void *
  pTrans->paramLen = paramLen;
 }
+int32_t mndSetRpcInfoForDbTrans(SMnode *pMnode, SRpcMsg *pMsg, EOperType oper, const char *dbname) {
+  STrans *pTrans = NULL;
+  void   *pIter = NULL;
+  int32_t code = -1;
+  while (1) {
+    pIter = sdbFetch(pMnode->pSdb, SDB_TRANS, pIter, (void **)&pTrans);
+    if (pIter == NULL) break;
+    if (pTrans->oper == oper) {
+      if (strcasecmp(dbname, pTrans->dbname1) == 0) {
+        mDebug("trans:%d, db:%s oper:%d matched with input", pTrans->id, dbname, oper);
+        if (taosArrayPush(pTrans->pRpcArray, &pMsg->info) != NULL) {
+          code = 0;
+        }
+        sdbRelease(pMnode->pSdb, pTrans);
+        break;
+      }
+    }
+    sdbRelease(pMnode->pSdb, pTrans);
+  }
+  return code;
+}
 void mndTransSetDbName(STrans *pTrans, const char *dbname1, const char *dbname2) {
  if (dbname1 != NULL) {
    memcpy(pTrans->dbname1, dbname1, TSDB_DB_FNAME_LEN);
@@ -688,6 +732,8 @@ void mndTransSetDbName(STrans *pTrans, const char *dbname1, const char *dbname2)
 void mndTransSetSerial(STrans *pTrans) { pTrans->exec = TRN_EXEC_SERIAL; }
+void mndTransSetOper(STrans *pTrans, EOperType oper) { pTrans->oper = oper; }
 static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) {
  SSdbRaw *pRaw = mndTransActionEncode(pTrans);
  if (pRaw == NULL) {
@@ -711,7 +757,7 @@ static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) {
 static bool mndCheckDbConflict(const char *db, STrans *pTrans) {
  if (db[0] == 0) return false;
-  if (strcmp(db, pTrans->dbname1) == 0 || strcmp(db, pTrans->dbname2) == 0) return true;
+  if (strcasecmp(db, pTrans->dbname1) == 0 || strcasecmp(db, pTrans->dbname2) == 0) return true;
  return false;
 }
@@ -784,9 +830,10 @@ int32_t mndTransPrepare(SMnode *pMnode, STrans *pTrans) {
    return -1;
  }
-  pNew->rpcInfo = pTrans->rpcInfo;
+  pNew->pRpcArray = pTrans->pRpcArray;
  pNew->rpcRsp = pTrans->rpcRsp;
  pNew->rpcRspLen = pTrans->rpcRspLen;
+  pTrans->pRpcArray = NULL;
  pTrans->rpcRsp = NULL;
  pTrans->rpcRspLen = 0;
@@ -835,29 +882,34 @@ static void mndTransSendRpcRsp(SMnode *pMnode, STrans *pTrans) {
    }
  }
-  if (sendRsp && pTrans->rpcInfo.handle != NULL) {
+  if (!sendRsp) return;
-    mDebug("trans:%d, send rsp, code:0x%x stage:%s app:%p", pTrans->id, code, mndTransStr(pTrans->stage),
-           pTrans->rpcInfo.ahandle);
+  int32_t size = taosArrayGetSize(pTrans->pRpcArray);
-    if (code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+  if (size <= 0) return;
-      code = TSDB_CODE_MND_TRANS_NETWORK_UNAVAILL;
-    }
+  for (int32_t i = 0; i < size; ++i) {
-    SRpcMsg rspMsg = {.code = code, .info = pTrans->rpcInfo};
+    SRpcHandleInfo *pInfo = taosArrayGet(pTrans->pRpcArray, i);
+    if (pInfo->handle != NULL) {
-    if (pTrans->rpcRspLen != 0) {
+      mDebug("trans:%d, send rsp, code:0x%x stage:%s app:%p", pTrans->id, code, mndTransStr(pTrans->stage),
-      void *rpcCont = rpcMallocCont(pTrans->rpcRspLen);
+             pInfo->ahandle);
-      if (rpcCont != NULL) {
+      if (code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
-        memcpy(rpcCont, pTrans->rpcRsp, pTrans->rpcRspLen);
+        code = TSDB_CODE_MND_TRANS_NETWORK_UNAVAILL;
-        rspMsg.pCont = rpcCont;
+      }
-        rspMsg.contLen = pTrans->rpcRspLen;
+      SRpcMsg rspMsg = {.code = code, .info = *pInfo};
+      if (pTrans->rpcRspLen != 0) {
+        void *rpcCont = rpcMallocCont(pTrans->rpcRspLen);
+        if (rpcCont != NULL) {
+          memcpy(rpcCont, pTrans->rpcRsp, pTrans->rpcRspLen);
+          rspMsg.pCont = rpcCont;
+          rspMsg.contLen = pTrans->rpcRspLen;
+        }
      }
-      taosMemoryFree(pTrans->rpcRsp);
-    }
-    tmsgSendRsp(&rspMsg);
+      tmsgSendRsp(&rspMsg);
-    pTrans->rpcInfo.handle = NULL;
+    }
-    pTrans->rpcRsp = NULL;
-    pTrans->rpcRspLen = 0;
  }
+  taosArrayClear(pTrans->pRpcArray);
 }
 int32_t mndTransProcessRsp(SRpcMsg *pRsp) {

--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -5661,7 +5661,12 @@ int32_t derivativeFunction(SqlFunctionCtx* pCtx) {
        double r = ((v - pDerivInfo->prevValue) * pDerivInfo->tsWindow) / (tsList[i] - pDerivInfo->prevTs);
        if (pDerivInfo->ignoreNegative && r < 0) {
        } else {
-          colDataAppend(pOutput, pos, (const char*)&r, false);
+          if (isinf(r) || isnan(r)) {
+            colDataAppendNULL(pOutput, pos);
+          } else {
+            colDataAppend(pOutput, pos, (const char*)&r, false);
+          }
          if (pTsOutput != NULL) {
            colDataAppendInt64(pTsOutput, pos, &tsList[i]);
          }
@@ -5688,7 +5693,12 @@ int32_t derivativeFunction(SqlFunctionCtx* pCtx) {
        double r = ((pDerivInfo->prevValue - v) * pDerivInfo->tsWindow) / (pDerivInfo->prevTs - tsList[i]);
        if (pDerivInfo->ignoreNegative && r < 0) {
        } else {
-          colDataAppend(pOutput, pos, (const char*)&r, false);
+          if (isinf(r) || isnan(r)) {
+            colDataAppendNULL(pOutput, pos);
+          } else {
+            colDataAppend(pOutput, pos, (const char*)&r, false);
+          }
          if (pTsOutput != NULL) {
            colDataAppendInt64(pTsOutput, pos, &pDerivInfo->prevTs);
          }

--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -248,8 +248,8 @@
 ./test.sh -f tsim/stream/sliding.sim
 # ---- transaction
- ./test.sh -f tsim/trans/lossdata1.sim
+./test.sh -f tsim/trans/lossdata1.sim
- ./test.sh -f tsim/trans/create_db.sim
+./test.sh -f tsim/trans/create_db.sim
 # ---- tmq
 ./test.sh -f tsim/tmq/basic1.sim

--- a/tests/script/tmp/data.sim
+++ b/tests/script/tmp/data.sim
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c telemetryReporting -v 1
+system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c telemetryInterval -v 1
+system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode1 -c telemetryServer -v localhost
+system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c telemetryPort -v 80
-return
 system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
 sql connect
-sql create database db 
+print =============== step1: create dnodes
-sql create table db.tb (ts timestamp, i int)
+sql create dnode $hostname port 7200
-sql insert into db.tb values(now, 1)
+sql create dnode $hostname port 7300
+sql create dnode $hostname port 7400
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> rows: $rows 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data24 $data35
+if $rows != 4 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi
+if $data(2)[4] != ready then
+  goto step1
+endi
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
+endi
+print =============== step2: create database
+sql create database db vgroups 1 replica 3
+sql show databases
+if $rows != 3 then 
+  return -1
+endi
+if $data(db)[4] != 3 then 
+  return -1
+endi
+sql show dnodes
+if $data(2)[2] != 1 then
+  return -1
+endi
+if $data(3)[2] != 1 then
+  return -1
+endi
+if $data(4)[2] != 1 then
+  return -1
+endi
+# vnodes
+sql show dnodes
+if $data(2)[2] != 1 then
+  return -1
+endi
+if $data(3)[2] != 1 then
+  return -1
+endi
+if $data(4)[2] != 1 then
+  return -1
+endi
+# v1_dnode
+$hasleader = 0
+$x = 0
+step2:
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show db.vgroups
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08
+if $data(2)[3] != 2 then
+  return -1
+endi
+if $data(2)[5] != 3 then
+  return -1
+endi
+if $data(2)[7] != 4 then
+  return -1
+endi
+if $data(2)[4] == leader then
+  $hasleader = 1
+endi
+if $data(2)[6] == leader then
+  $hasleader = 1
+endi
+if $data(2)[8] == leader then
+  $hasleader = 1
+endi
+if $hasleader != 1 then
+  goto step2
+endi
+sql use db;
+sql create table stb (ts timestamp, c int) tags (t int);
+sql create table t0 using stb tags (0);
+sql insert into t0 values(now, 1);
+sql show db.stables;
+sql show db.tables;
+sql show db.vgroups;
+return
 print ======== start back
 run_back tmp/back.sim

--- a/tests/script/tmp/monitor.sim
+++ b/tests/script/tmp/monitor.sim
@@ -6,32 +6,21 @@ system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
 system sh/cfg.sh -n dnode1 -c monitorComp -v 1
 #system sh/cfg.sh -n dnode1 -c supportVnodes -v 128
+#system sh/cfg.sh -n dnode1 -c telemetryReporting -v 1
+#system sh/cfg.sh -n dnode1 -c telemetryInterval -v 1
+#system sh/cfg.sh -n dnode1 -c telemetryServer -v localhost
+#system sh/cfg.sh -n dnode1 -c telemetryPort -v 80
 system sh/exec.sh -n dnode1 -s start
 sql connect
 print =============== show dnodes
-sleep 2000
 sql create database db vgroups 2;
 sql use db;
 sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 binary(16)) comment "abd";
-sleep 2000
 print =============== create drop qnode 1
 sql create qnode on dnode 1
 sql create snode on dnode 1
 sql create bnode on dnode 1
-return
-print =============== restart
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode1 -s start
-return 
-system sh/deploy.sh -n dnode2 -i 2
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
--- a/tests/script/tsim/db/alter_replica_31.sim
+++ b/tests/script/tsim/db/alter_replica_31.sim
@@ -111,15 +111,6 @@ if $hasleader != 1 then
  goto step2
 endi
-# sql use db;
-# sql create table stb (ts timestamp, c int) tags (t int);
-# sql create table t0 using stb tags (0);
-# sql insert into t0 values(now, 1);
-# sql show db.stables;
-# sql show db.tables;
-# sql show db.vgroups;
-return
 sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 binary(16)) comment "abd"
 sql create table db.ctb using db.stb tags(101, "102")
 sql insert into db.ctb values(now, 1, "2")

--- a/tests/script/tsim/valgrind/checkError1.sim
+++ b/tests/script/tsim/valgrind/checkError1.sim
@@ -152,7 +152,7 @@ endi
 system_content sh/checkValgrind.sh -n dnode2
 print cmd return result ----> [ $system_content ]
-if $system_content > 4 then
+if $system_content > 0 then
  return -1
 endi 

--- a/tests/system-test/0-others/sysinfo.py
+++ b/tests/system-test/0-others/sysinfo.py
@@ -24,7 +24,7 @@ class TDTestCase:
        tdLog.debug("start to execute %s" % __file__)
        tdSql.init(conn.cursor())
        self.dbname = 'db'
-        self.delaytime = 10
+        self.delaytime = 3
    def get_database_info(self):
        tdSql.query('select database()')
        tdSql.checkData(0,0,None)
@@ -42,12 +42,13 @@ class TDTestCase:
            tdSql.checkData(0,0,version_info)
    def get_server_status(self):
+        sleep(self.delaytime)
        tdSql.query('select server_status()')
        tdSql.checkData(0,0,1)
        #!for bug
-        # tdDnodes.stoptaosd(1)
+        tdDnodes.stoptaosd(1)
-        # sleep(self.delaytime)
+        sleep(self.delaytime)
-        # tdSql.error('select server_status()')
+        tdSql.error('select server_status()')
    def run(self):
        self.get_database_info()

--- a/tests/system-test/1-insert/insert_drop.py
+++ b/tests/system-test/1-insert/insert_drop.py
+# -*- coding: utf-8 -*-
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+import threading
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+    def genMultiThreadSeq(self, sql_list):
+        tlist = list()
+        for insert_sql in sql_list:
+            t = threading.Thread(target=tdSql.execute, args=(insert_sql,))
+            tlist.append(t)
+        return tlist
+    def multiThreadRun(self, tlist):
+        for t in tlist:
+            t.start()
+        for t in tlist:
+            t.join()
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute('create database if not exists test;')
+        tdSql.execute('create table test.stb (ts timestamp, c11 int, c12 float ) TAGS(t11 int, t12 int );')
+        tdSql.execute('create table test.tb using test.stb TAGS (1, 1);')
+        sql_list = list()
+        for i in range(5):
+            sql = f'insert into test.tb values (now-{i}m, {i}, {i});'
+            sql_list.append(sql)
+        sql_list.append(f'drop database test;')
+        tlist = self.genMultiThreadSeq(sql_list)
+        self.multiThreadRun(tlist)
+        tdSql.query(f'show databases')
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/system-test/2-query/tsbsQuery.py
+++ b/tests/system-test/2-query/tsbsQuery.py
@@ -113,6 +113,7 @@ class TDTestCase:
        #taosc core dumped
        tdSql.execute("create table random_measure2_1 (ts timestamp,ela float, name binary(40))")
        tdSql.query("SELECT ts,diff(mv) AS difka  FROM (SELECT ts,name,floor(avg(velocity)/10)/floor(avg(velocity)/10) AS mv FROM readings   WHERE name!='' AND ts > '2016-01-01T00:00:00Z' AND ts < '2016-01-05T00:00:01Z'   partition by name,ts interval(10m) fill(value,0))  GROUP BY name,ts;")
+        tdSql.query("select name,diff(mv) AS difka  FROM (SELECT  ts,name,mv  FROM (SELECT _wstart as ts,name,floor(avg(velocity)/10)/floor(avg(velocity)/10) AS mv FROM readings   WHERE name!='' AND ts > '2016-01-01T00:00:00Z' AND ts < '2016-01-05T00:00:01Z'   partition by name interval(10m) fill(value,0)))  group  BY name ;")
        tdSql.query("SELECT _wstart,name,floor(avg(velocity)/10)/floor(avg(velocity)/10) AS mv FROM readings   WHERE name!='' AND ts > '2016-01-01T00:00:00Z' AND ts < '2016-01-05T00:00:01Z'   partition by name interval(10m) fill(value,0)")
        # 7. avg-load
@@ -124,9 +125,16 @@ class TDTestCase:
        #it's already supported:
        # last-loc
-        tdSql.query("")
+        tdSql.query("SELECT last_row(ts),latitude,longitude,name,driver FROM readings WHERE fleet='South' and name IS NOT NULL partition BY name,driver order by name ;")
-    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        #2. low-fuel
+        tdSql.query("SELECT last_row(ts),name,driver,fuel_state,driver FROM diagnostics WHERE fuel_state <= 0.1 AND fleet = 'South' and name IS NOT NULL GROUP BY name,driver order by name;")
+        # 3. avg-vs-projected-fuel-consumption
+        tdSql.query("select avg(fuel_consumption) as avg_fuel_consumption,avg(nominal_fuel_consumption) as nominal_fuel_consumption from readings where velocity > 1 group by fleet")
+    def run(self):  
        tdLog.printNoPrefix("==========step1:create database and table,insert data  ==============")
        self.prepareData()
        self.tsbsIotQuery()

--- a/tests/system-test/6-cluster/5dnode1mnode.py
+++ b/tests/system-test/6-cluster/5dnode1mnode.py
@@ -126,7 +126,7 @@ class TDTestCase:
        tdSql.error("alter database db strict 'off'")
        # tdSql.execute('alter database db strict 'on'')
        # tdSql.query('show databases;')
-        # tdSql.checkData(2,5,'strict')
+        # tdSql.checkData(2,5,'on')
    def getConnection(self, dnode):
        host = dnode.cfgDict["fqdn"]

--- a/tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py
@@ -107,7 +107,7 @@ class TDTestCase:
                    'ctbPrefix':  'ctb',
                    'ctbNum':     200,
                    'startTs':    1640966400000,  # 2022-01-01 00:00:00.000
-                    "rowsPerTbl": 1000,
+                    "rowsPerTbl": 100,
                    "batchNum": 5000
                    }
@@ -213,7 +213,7 @@ class TDTestCase:
            tdSql.checkRows(rowsPerStb)
    def run(self): 
        # print(self.master_dnode.cfgDict)
-        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='dnode')
+        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=1,stopRole='dnode')
    def stop(self):
        tdSql.close()

--- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py
@@ -68,7 +68,7 @@ class TDTestCase:
    def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole):
        tdLog.printNoPrefix("======== test case 1: ")
        paraDict = {'dbName':     'db',
-                    'dbNumbers':   20,
+                    'dbNumbers':   6,
                    'dropFlag':   1,
                    'event':      '',
                    'vgroups':    4,
@@ -110,7 +110,7 @@ class TDTestCase:
        print(tdSql.queryResult)
        clusterComCheck.checkDnodes(dnodeNumbers)
-        # create database and stable
+        tdLog.info("create database and stable") 
        tdDnodes=cluster.dnodes
        stopcount =0
        threads=[]
@@ -156,10 +156,16 @@ class TDTestCase:
        for tr in threads:
            tr.join()
+        tdLog.info("check dnode number:")
        clusterComCheck.checkDnodes(dnodeNumbers)
-        clusterComCheck.checkDbRows(allDbNumbers)
+        tdSql.query("show databases")
-        for i in range(restartNumbers):
+        tdLog.debug("we find %d databases but exepect to create %d  databases "%(tdSql.queryRows-2,allDbNumbers-2))
-            clusterComCheck.checkDb(paraDict['dbNumbers'],restartNumbers,dbNameIndex = '%s%d'%(paraDict["dbName"],i))
+        # tdLog.info("check DB Rows:")
+        # clusterComCheck.checkDbRows(allDbNumbers)
+        # tdLog.info("check DB Status on by on")
+        # for i in range(restartNumbers):
+        #     clusterComCheck.checkDb(paraDict['dbNumbers'],restartNumbers,dbNameIndex = '%s%d'%(paraDict["dbName"],i))
    def run(self): 

--- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDbRep3.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDbRep3.py
+from ssl import ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE
+import taos
+import sys
+import time
+import os 
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import TDDnodes
+from util.dnodes import TDDnode
+from util.cluster import *
+sys.path.append("./6-cluster")
+from clusterCommonCreate import *
+from clusterCommonCheck import clusterComCheck 
+import time
+import socket
+import subprocess
+from multiprocessing import Process
+import threading 
+import time
+import inspect
+import ctypes
+class TDTestCase:
+    def init(self,conn ,logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        self.TDDnodes = None
+        tdSql.init(conn.cursor())
+        self.host = socket.gethostname()
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+    def _async_raise(self, tid, exctype):
+        """raises the exception, performs cleanup if needed"""
+        if not inspect.isclass(exctype):
+            exctype = type(exctype)
+        res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(exctype))
+        if res == 0:
+            raise ValueError("invalid thread id")
+        elif res != 1:
+            # """if it returns a number greater than one, you're in trouble, 
+            # and you should call it again with exc=NULL to revert the effect"""
+            ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, None)
+            raise SystemError("PyThreadState_SetAsyncExc failed")
+    def stopThread(self,thread):
+        self._async_raise(thread.ident, SystemExit)
+    def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole):
+        tdLog.printNoPrefix("======== test case 1: ")
+        paraDict = {'dbName':     'db',
+                    'dbNumbers':   6,
+                    'dropFlag':   1,
+                    'event':      '',
+                    'vgroups':    4,
+                    'replica':    3,
+                    'stbName':    'stb',
+                    'stbNumbers': 100,
+                    'colPrefix':  'c',
+                    'tagPrefix':  't',
+                    'colSchema':   [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}],
+                    'tagSchema':   [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}],
+                    'ctbPrefix':  'ctb',
+                    'ctbNum':     1,
+                    }
+        dnodeNumbers=int(dnodeNumbers)
+        mnodeNums=int(mnodeNums)
+        vnodeNumbers = int(dnodeNumbers-mnodeNums)
+        allDbNumbers=(paraDict['dbNumbers']*restartNumbers)
+        allStbNumbers=(paraDict['stbNumbers']*restartNumbers)
+        tdLog.info("first check dnode and mnode")
+        tdSql.query("show dnodes;")
+        tdSql.checkData(0,1,'%s:6030'%self.host)
+        tdSql.checkData(4,1,'%s:6430'%self.host)
+        clusterComCheck.checkDnodes(dnodeNumbers)
+        clusterComCheck.checkMnodeStatus(1)
+        # fisr add three mnodes;
+        tdLog.info("fisr add three mnodes and check mnode status")
+        tdSql.execute("create mnode on dnode 2")
+        clusterComCheck.checkMnodeStatus(2)
+        tdSql.execute("create mnode on dnode 3")
+        clusterComCheck.checkMnodeStatus(3)
+        # add some error operations and 
+        tdLog.info("Confirm the status of the dnode again")
+        tdSql.error("create mnode on dnode 2")
+        tdSql.query("show dnodes;")
+        print(tdSql.queryResult)
+        clusterComCheck.checkDnodes(dnodeNumbers)
+        tdLog.info("create database and stable") 
+        tdDnodes=cluster.dnodes
+        stopcount =0
+        threads=[]
+        for i in range(restartNumbers):
+            dbNameIndex = '%s%d'%(paraDict["dbName"],i)
+            newTdSql=tdCom.newTdSql()
+            threads.append(threading.Thread(target=clusterComCreate.create_databases, args=(newTdSql, dbNameIndex,paraDict["dbNumbers"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica'])))
+        for tr in threads:
+            tr.start()
+        tdLog.info("Take turns stopping Mnodes ") 
+        while stopcount < restartNumbers:
+            tdLog.info(" restart loop: %d"%stopcount )
+            if stopRole == "mnode":
+                for i in range(mnodeNums):
+                    tdDnodes[i].stoptaosd()
+                    # sleep(10)
+                    tdDnodes[i].starttaosd()
+                    # sleep(10) 
+            elif stopRole == "vnode":
+                for i in range(vnodeNumbers):
+                    tdDnodes[i+mnodeNums].stoptaosd()
+                    # sleep(10)
+                    tdDnodes[i+mnodeNums].starttaosd()
+                    # sleep(10)
+            elif stopRole == "dnode":
+                for i in range(dnodeNumbers):
+                    tdDnodes[i].stoptaosd()
+                    # sleep(10)
+                    tdDnodes[i].starttaosd()
+                    # sleep(10) 
+            # dnodeNumbers don't include database of schema
+            if clusterComCheck.checkDnodes(dnodeNumbers):
+                tdLog.info("check dnodes status is ready")
+            else:
+                tdLog.info("check dnodes status is not ready")
+                self.stopThread(threads)
+                tdLog.exit("one or more of dnodes failed to start ")
+                # self.check3mnode()
+            stopcount+=1
+        for tr in threads:
+            tr.join()
+        tdLog.info("check dnode number:")
+        clusterComCheck.checkDnodes(dnodeNumbers)
+        tdSql.query("show databases")
+        tdLog.debug("we find %d databases but exepect to create %d  databases "%(tdSql.queryRows-2,allDbNumbers-2))
+        # tdLog.info("check DB Rows:")
+        # clusterComCheck.checkDbRows(allDbNumbers)
+        # tdLog.info("check DB Status on by on")
+        # for i in range(restartNumbers):
+        #     clusterComCheck.checkDb(paraDict['dbNumbers'],restartNumbers,dbNameIndex = '%s%d'%(paraDict["dbName"],i))
+    def run(self): 
+        # print(self.master_dnode.cfgDict)
+        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='mnode')
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file
--- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateStb.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateStb.py
@@ -189,7 +189,8 @@ class TDTestCase:
        tdSql.execute("use %s" %(paraDict["dbName"]))
        tdSql.query("show stables")
-        tdSql.checkRows(allStbNumbers)
+        tdLog.debug("we find %d stables but exepect to create %d  stables "%(tdSql.queryRows,allStbNumbers))
+        # tdSql.checkRows(allStbNumbers)
    def run(self): 

--- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
@@ -68,10 +68,10 @@ class TDTestCase:
    def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole):
        tdLog.printNoPrefix("======== test case 1: ")
        paraDict = {'dbName':     'db',
-                    'dbNumbers':   20,
+                    'dbNumbers':   8,
                    'dropFlag':   1,
                    'event':      '',
-                    'vgroups':    4,
+                    'vgroups':    2,
                    'replica':    1,
                    'stbName':    'stb',
                    'stbNumbers': 100,
@@ -124,49 +124,54 @@ class TDTestCase:
        for tr in threads:
            tr.start()
-        tdLog.info("Take turns stopping Mnodes ") 
+        # tdLog.info("Take turns stopping Mnodes ") 
-        while stopcount < restartNumbers:
+        # while stopcount < restartNumbers:
-            tdLog.info(" restart loop: %d"%stopcount )
+        #     tdLog.info(" restart loop: %d"%stopcount )
-            if stopRole == "mnode":
+        #     if stopRole == "mnode":
-                for i in range(mnodeNums):
+        #         for i in range(mnodeNums):
-                    tdDnodes[i].stoptaosd()
+        #             tdDnodes[i].stoptaosd()
-                    # sleep(10)
+        #             # sleep(10)
-                    tdDnodes[i].starttaosd()
+        #             tdDnodes[i].starttaosd()
-                    # sleep(10) 
+        #             # sleep(10) 
-            elif stopRole == "vnode":
+        #     elif stopRole == "vnode":
-                for i in range(vnodeNumbers):
+        #         for i in range(vnodeNumbers):
-                    tdDnodes[i+mnodeNums].stoptaosd()
+        #             tdDnodes[i+mnodeNums].stoptaosd()
-                    # sleep(10)
+        #             # sleep(10)
-                    tdDnodes[i+mnodeNums].starttaosd()
+        #             tdDnodes[i+mnodeNums].starttaosd()
-                    # sleep(10)
+        #             # sleep(10)
-            elif stopRole == "dnode":
+        #     elif stopRole == "dnode":
-                for i in range(dnodeNumbers):
+        #         for i in range(dnodeNumbers):
-                    tdDnodes[i].stoptaosd()
+        #             tdDnodes[i].stoptaosd()
-                    # sleep(10)
+        #             # sleep(10)
-                    tdDnodes[i].starttaosd()
+        #             tdDnodes[i].starttaosd()
-                    # sleep(10) 
+        #             # sleep(10) 
-            # dnodeNumbers don't include database of schema
+        #     # dnodeNumbers don't include database of schema
-            if clusterComCheck.checkDnodes(dnodeNumbers):
+        #     if clusterComCheck.checkDnodes(dnodeNumbers):
-                tdLog.info("check dnodes status is ready")
+        #         tdLog.info("check dnodes status is ready")
-            else:
+        #     else:
-                tdLog.info("check dnodes status is not ready")
+        #         tdLog.info("check dnodes status is not ready")
-                self.stopThread(threads)
+        #         self.stopThread(threads)
-                tdLog.exit("one or more of dnodes failed to start ")
+        #         tdLog.exit("one or more of dnodes failed to start ")
-                # self.check3mnode()
+        #         # self.check3mnode()
-            stopcount+=1
+        #     stopcount+=1
        for tr in threads:
            tr.join()
        clusterComCheck.checkDnodes(dnodeNumbers)
-        clusterComCheck.checkDbRows(allDbNumbers)
+        tdSql.query("show databases")
-        for i in range(restartNumbers):
+        tdLog.debug("we find %d databases but exepect to create %d  databases "%(tdSql.queryRows-2,allDbNumbers))
-            clusterComCheck.checkDb(paraDict['dbNumbers'],restartNumbers,dbNameIndex = '%s%d'%(paraDict["dbName"],i))
+        # # tdLog.info("check DB Rows:")
+        # clusterComCheck.checkDbRows(allDbNumbers)
+        # # tdLog.info("check DB Status on by on")
+        # for i in range(restartNumbers):
+        #     clusterComCheck.checkDb(paraDict['dbNumbers'],restartNumbers,dbNameIndex = '%s%d'%(paraDict["dbName"],i))
    def run(self): 
        # print(self.master_dnode.cfgDict)
-        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='vnode')
+        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=15,stopRole='vnode')
    def stop(self):
        tdSql.close()

--- a/tests/system-test/6-cluster/clusterCommonCheck.py
+++ b/tests/system-test/6-cluster/clusterCommonCheck.py
@@ -89,7 +89,7 @@ class ClusterComCheck:
            # print(query_status)
            count+=1
            if query_status == dbNumbers:
-                tdLog.success("we find cluster with %d dnode and check all databases  are ready within 5s! " %dbNumbers)
+                tdLog.success(" check %d database and  all databases  are ready within 5s! " %dbNumbers)
                return True
        else:
            tdLog.debug(tdSql.queryResult)

--- a/tests/system-test/6-cluster/clusterCommonCreate.py
+++ b/tests/system-test/6-cluster/clusterCommonCreate.py
@@ -127,6 +127,7 @@ class ClusterComCreate:
        for i in range(dbNumbers):
            if dropFlag == 1:
                tsql.execute("drop database if exists %s_%d"%(dbNameIndex,i))
+            tdLog.debug("create database if not exists %s_%d vgroups %d replica %d"%(dbNameIndex,i, vgroups, replica))
            tsql.execute("create database if not exists %s_%d vgroups %d replica %d"%(dbNameIndex,i, vgroups, replica))
            tdLog.debug("complete to create database %s_%d"%(dbNameIndex,i))
        return
@@ -138,6 +139,7 @@ class ClusterComCreate:
    def create_stables(self,tsql,dbNameIndex,stbNameIndex,stbNumbers):
        for i in range(stbNumbers):
+            tdLog.debug("create table if not exists %s.%s_%d (ts timestamp, c1 int, c2 int, c3 binary(16)) tags(t1 int, t2 binary(32))"%(dbNameIndex, stbNameIndex,i))
            tsql.execute("create table if not exists %s.%s_%d (ts timestamp, c1 int, c2 int, c3 binary(16)) tags(t1 int, t2 binary(32))"%(dbNameIndex, stbNameIndex,i))
            tdLog.debug("complete to create %s.%s_%d" %(dbNameIndex, stbNameIndex,i))
        return 

--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -137,7 +137,7 @@ python3 ./test.py -f 6-cluster/5dnode1mnode.py
 python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py -N 5 -M 3
-python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py  -N 5 -M 3
+# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py  -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateStb.py  -N 5 -M 3
 # python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py  -N 5 -M 3