Merge pull request #1340 from taosdata/refact/slguan

Refact/slguan

src/CMakeLists.txt

@@ -15,5 +15,5 @@ ADD_SUBDIRECTORY(plugins)
 ADD_SUBDIRECTORY(sdb)
 ADD_SUBDIRECTORY(mnode)
 ADD_SUBDIRECTORY(vnode)
-# ADD_SUBDIRECTORY(dnode)
+ADD_SUBDIRECTORY(dnode)
 #ADD_SUBDIRECTORY(connector/jdbc)

src/client/src/tscSQLParser.c

@@ -395,7 +395,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       char* pMsg = pCmd->payload + tsRpcHeadSize;
       pMsg += sizeof(SMgmtHead);
 
-      SCfgDnodeMsg* pCfg = (SCfgDnodeMsg*)pMsg;
+      SCMCfgDnodeMsg* pCfg = (SCMCfgDnodeMsg*)pMsg;
       strncpy(pCfg->ip, pDCL->a[0].z, pDCL->a[0].n);
 
       strncpy(pCfg->config, pDCL->a[1].z, pDCL->a[1].n);

src/client/src/tscServer.c

@@ -1795,14 +1795,14 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
 int32_t tscBuildCfgDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
-  pCmd->payloadLen = sizeof(SCfgDnodeMsg);
+  pCmd->payloadLen = sizeof(SCMCfgDnodeMsg);
 
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
     tscError("%p failed to malloc for query msg", pSql);
     return TSDB_CODE_CLI_OUT_OF_MEMORY;
   }
 
-  pCmd->msgType = TSDB_MSG_TYPE_DNODE_CFG;
+  pCmd->msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE;
   return TSDB_CODE_SUCCESS;
 }
 

src/common/CMakeLists.txt

-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
 
-add_library(common ${SOURCE_LIST})
-target_include_directories(
-    common 
-        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc
-        PUBLIC ${CMAKE_SOURCE_DIR}/src/inc
-        PUBLIC ${CMAKE_SOURCE_DIR}/src/os/linux/inc
-        )
\ No newline at end of file
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
+  ADD_LIBRARY(common ${SRC})
+ENDIF ()

src/dnode/CMakeLists.txt

@@ -7,7 +7,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/tsdb/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/common/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
   INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
@@ -26,7 +26,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
       COMMAND echo "make test directory"
       DEPENDS taosd
       COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
-      COMMAND ${CMAKE_COMMAND} -E make_directoryF ${TD_TESTS_OUTPUT_DIR}/log/
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
       COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
       COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
       COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg

src/dnode/inc/dnodeRead.h

@@ -20,12 +20,11 @@
 extern "C" {
 #endif
 
-int   dnodeInitRead();
-void  dnodeCleanupRead();
-void  dnodeRead(SRpcMsg *);
-void *dnodeAllocateReadWorker();
-void  dnodeFreeReadWorker(void *rqueue);
- 
+int32_t dnodeInitRead();
+void    dnodeCleanupRead();
+void    dnodeRead(void *pMsg);
+void *  dnodeAllocateReadWorker();
+void    dnodeFreeReadWorker(void *rqueue);
 
 #ifdef __cplusplus
 }

src/dnode/inc/dnodeWrite.h

@@ -20,12 +20,11 @@
 extern "C" {
 #endif
 
-int   dnodeInitWrite();
-void  dnodeCleanupWrite();
-void  dnodeWrite(SRpcMsg *pMsg);
-void *dnodeAllocateWriteWorker();
-void  dnodeFreeWriteWorker(void *worker);
-
+int32_t dnodeInitWrite();
+void    dnodeCleanupWrite();
+void    dnodeWrite(void *pMsg);
+void *  dnodeAllocateWriteWorker();
+void    dnodeFreeWriteWorker(void *worker);
 
 #ifdef __cplusplus
 }

src/dnode/src/dnodeMClient.c

@@ -52,6 +52,7 @@ int32_t dnodeInitMClient() {
 void dnodeCleanupMClient() {
   if (tsDnodeMClientRpc) {
     rpcClose(tsDnodeMClientRpc);
+    tsDnodeMClientRpc = NULL;
   }
 }
 

src/dnode/src/dnodeMgmt.c

@@ -44,19 +44,19 @@ static int32_t  dnodeOpenVnodes();
 static void     dnodeCleanupVnodes();
 static int32_t  dnodeOpenVnode(int32_t vgId);
 static void     dnodeCleanupVnode(SVnodeObj *pVnode);
-static int32_t  dnodeCreateVnode(SCreateVnodeMsg *cfg);
+static int32_t  dnodeCreateVnode(SMDCreateVnodeMsg *cfg);
 static void     dnodeDropVnode(SVnodeObj *pVnode);
-static void     dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg);
-static void     dnodeProcessDropVnodeMsg(SRpcMsg *pMsg);
+static void     dnodeProcesSMDCreateVnodeMsg(SRpcMsg *pMsg);
+static void     dnodeProcesSMDDropVnodeMsg(SRpcMsg *pMsg);
 static void     dnodeProcessAlterVnodeMsg(SRpcMsg *pMsg);
 static void   (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg);
 
 static void * tsDnodeVnodesHash = NULL;
 
 int32_t dnodeInitMgmt() {
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_CREATE_VNODE] = dnodeProcessCreateVnodeMsg;
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_DROP_VNODE]   = dnodeProcessDropVnodeMsg;
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_ALTER_VNODE]  = dnodeProcessDropVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeProcesSMDCreateVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE]   = dnodeProcesSMDDropVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE]  = dnodeProcessAlterVnodeMsg;
 
   tsDnodeVnodesHash = taosInitIntHash(TSDB_MAX_VNODES, sizeof(SVnodeObj), taosHashInt);
   if (tsDnodeVnodesHash == NULL) {
@@ -176,26 +176,24 @@ static void dnodeCleanupVnode(SVnodeObj *pVnode) {
 
   // remove read queue
   dnodeFreeReadWorker(pVnode->rworker);
+  pVnode->rworker = NULL;
 
   // remove write queue
   dnodeFreeWriteWorker(pVnode->wworker);
+  pVnode->wworker = NULL;
 
   // remove wal
 
   // remove tsdb
   if (pVnode->tsdb) {
     tsdbCloseRepo(pVnode->tsdb);
+    pVnode->tsdb = NULL;
   }
 
   taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
 }
 
-static int32_t dnodeCreateVnode(SCreateVnodeMsg *pVnodeCfg) {
-  pVnodeCfg->vnode           = htonl(pVnodeCfg->vnode);
-  pVnodeCfg->cfg.vgId        = htonl(pVnodeCfg->cfg.vgId);
-  pVnodeCfg->cfg.maxSessions = htonl(pVnodeCfg->cfg.maxSessions);
-  pVnodeCfg->cfg.daysPerFile = htonl(pVnodeCfg->cfg.daysPerFile);
-
+static int32_t dnodeCreateVnode(SMDCreateVnodeMsg *pVnodeCfg) {
   STsdbCfg tsdbCfg;
   tsdbCfg.precision           = pVnodeCfg->cfg.precision;
   tsdbCfg.tsdbId              = pVnodeCfg->vnode;
@@ -248,47 +246,60 @@ static void dnodeDropVnode(SVnodeObj *pVnode) {
   dnodeCleanupVnode(pVnode);
 }
 
-static void dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg) {
-
-//  SVnodeObj  *pVnode;
-//  int32_t         vgId;
-//  SVPeersMsg *pCfg;
-  
-  // check everything, if not ok, set terrno;
-
+static void dnodeProcesSMDCreateVnodeMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
 
-  // everything is ok
+  SMDCreateVnodeMsg *pCreate = (SMDCreateVnodeMsg *) rpcMsg->pCont;
+  pCreate->vnode           = htonl(pCreate->vnode);
+  pCreate->cfg.vgId        = htonl(pCreate->cfg.vgId);
+  pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions);
+  pCreate->cfg.daysPerFile = htonl(pCreate->cfg.daysPerFile);
 
-//  dnodeCreateVnode(vgId, pCfg);
+  SVnodeObj *pVnodeObj = taosGetIntHashData(tsDnodeVnodesHash, pCreate->cfg.vgId);
+  if (pVnodeObj != NULL) {
+    rpcRsp.code = TSDB_CODE_SUCCESS;
+  } else {
+    rpcRsp.code = dnodeCreateVnode(pCreate);
+  }
 
-  //if (pVnode == NULL) terrno = TSDB_CODE
+  rpcSendResponse(&rpcRsp);
+  rpcFreeCont(rpcMsg->pCont);
 }
 
-static void dnodeProcessDropVnodeMsg(SRpcMsg *pMsg) {
-
-  SVnodeObj *pVnode;
-  int32_t    vgId;
-  
-  // check everything, if not ok, set terrno;
+static void dnodeProcesSMDDropVnodeMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
 
+  SMDDropVnodeMsg *pDrop = (SMDCreateVnodeMsg *) rpcMsg->pCont;
+  pDrop->vgId = htonl(pDrop->vgId);
 
-  // everything is ok
-  dnodeDropVnode(pVnode);
+  SVnodeObj *pVnodeObj = taosGetIntHashData(tsDnodeVnodesHash, pDrop->vgId);
+  if (pVnodeObj != NULL) {
+    dnodeDropVnode(pVnodeObj);
+    rpcRsp.code = TSDB_CODE_SUCCESS;
+  } else {
+    rpcRsp.code = TSDB_CODE_INVALID_VGROUP_ID;
+  }
 
-  //if (pVnode == NULL) terrno = TSDB_CODE
+  rpcSendResponse(&rpcRsp);
+  rpcFreeCont(rpcMsg->pCont);
 }
 
-static void dnodeProcessAlterVnodeMsg(SRpcMsg *pMsg) {
-
-  SVnodeObj *pVnode;
-  int32_t        vgId;
-  
-  // check everything, if not ok, set terrno;
+static void dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
 
+  SMDCreateVnodeMsg *pCreate = (SMDCreateVnodeMsg *) rpcMsg->pCont;
+  pCreate->vnode           = htonl(pCreate->vnode);
+  pCreate->cfg.vgId        = htonl(pCreate->cfg.vgId);
+  pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions);
+  pCreate->cfg.daysPerFile = htonl(pCreate->cfg.daysPerFile);
 
-  // everything is ok
-//  dnodeAlterVnode(pVnode);
+  SVnodeObj *pVnodeObj = taosGetIntHashData(tsDnodeVnodesHash, pCreate->cfg.vgId);
+  if (pVnodeObj != NULL) {
+    rpcRsp.code = TSDB_CODE_SUCCESS;
+  } else {
+    rpcRsp.code = dnodeCreateVnode(pCreate);;
+  }
 
-  //if (pVnode == NULL) terrno = TSDB_CODE
+  rpcSendResponse(&rpcRsp);
+  rpcFreeCont(rpcMsg->pCont);
 }
-

src/dnode/src/dnodeMnode.c

@@ -26,9 +26,9 @@ static void   dnodeProcessMsgFromMnode(SRpcMsg *pMsg);
 static void  *tsDnodeMnodeRpc = NULL;
 
 int32_t dnodeInitMnode() {
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_DNODE_CREATE_TABLE] = dnodeWrite;
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_DNODE_REMOVE_TABLE] = dnodeWrite;
-  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_DROP_VNODE] = dnodeMgmt;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = dnodeWrite;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE] = dnodeWrite;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeMgmt;
 
   SRpcInit rpcInit;
   memset(&rpcInit, 0, sizeof(rpcInit));

src/dnode/src/dnodeRead.c

@@ -16,10 +16,10 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taoserror.h"
-#include "tlog.h"
-#include "trpc.h"
 #include "taosmsg.h"
+#include "tlog.h"
 #include "tqueue.h"
+#include "trpc.h"
 #include "dnodeRead.h"
 #include "dnodeMgmt.h"
 
@@ -31,7 +31,7 @@ typedef struct {
 
 typedef struct {
   void        *pCont;
-  int          contLen;
+  int32_t      contLen;
   SRpcMsg      rpcMsg;
   void        *pVnode;
   SRpcContext *pRpcContext;  // RPC message context
@@ -42,16 +42,16 @@ static void  dnodeProcessReadResult(SReadMsg *pRead);
 static void  dnodeHandleIdleReadWorker();
 static void  dnodeProcessQueryMsg(SReadMsg *pMsg);
 static void  dnodeProcessRetrieveMsg(SReadMsg *pMsg);
-static void (*dnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SReadMsg *pNode);
+static void(*dnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SReadMsg *pNode);
 
 // module global variable
 static taos_qset readQset;
-static int       threads;    // number of query threads
-static int       maxThreads;
-static int       minThreads;
+static int32_t   threads;    // number of query threads
+static int32_t   maxThreads;
+static int32_t   minThreads;
 
-int dnodeInitRead() {
-  dnodeProcessReadMsgFp[TSDB_MSG_TYPE_QUERY] = dnodeProcessQueryMsg;
+int32_t dnodeInitRead() {
+  dnodeProcessReadMsgFp[TSDB_MSG_TYPE_QUERY]    = dnodeProcessQueryMsg;
   dnodeProcessReadMsgFp[TSDB_MSG_TYPE_RETRIEVE] = dnodeProcessRetrieveMsg;
 
   readQset = taosOpenQset();
@@ -67,12 +67,14 @@ void dnodeCleanupRead() {
   taosCloseQset(readQset);
 }
 
-void dnodeRead(SRpcMsg *pMsg) {
-  int     leftLen = pMsg->contLen;
-  char   *pCont = (char *)pMsg->pCont;
-  int     contLen = 0;
-  int     numOfVnodes = 0;
-  int32_t vgId = 0;
+void dnodeRead(void *rpcMsg) {
+  SRpcMsg *pMsg = rpcMsg;
+
+  int32_t     leftLen      = pMsg->contLen;
+  char        *pCont       = (char *) pMsg->pCont;
+  int32_t     contLen      = 0;
+  int32_t     numOfVnodes  = 0;
+  int32_t     vgId         = 0;
   SRpcContext *pRpcContext = NULL;
 
   // parse head, get number of vnodes;
@@ -87,31 +89,31 @@ void dnodeRead(SRpcMsg *pMsg) {
     // get pVnode from vgId
     void *pVnode = dnodeGetVnode(vgId);
     if (pVnode == NULL) {
-
       continue;
     }
-   
+
     // put message into queue
     SReadMsg readMsg;
-    readMsg.rpcMsg = *pMsg;
-    readMsg.pCont = pCont;
-    readMsg.contLen = contLen;
-    readMsg.pRpcContext = pRpcContext;   
-    readMsg.pVnode = pVnode;
+    readMsg.rpcMsg      = *pMsg;
+    readMsg.pCont       = pCont;
+    readMsg.contLen     = contLen;
+    readMsg.pRpcContext = pRpcContext;
+    readMsg.pVnode      = pVnode;
 
     taos_queue queue = dnodeGetVnodeRworker(pVnode);
     taosWriteQitem(queue, &readMsg);
- 
-    // next vnode 
+
+    // next vnode
     leftLen -= contLen;
-    pCont -= contLen; 
+    pCont -= contLen;
+
+    dnodeReleaseVnode(pVnode);
   }
 }
 
 void *dnodeAllocateReadWorker() {
-
   taos_queue *queue = taosOpenQueue(sizeof(SReadMsg));
-  if ( queue == NULL ) return NULL;
+  if (queue == NULL) return NULL;
 
   taosAddIntoQset(readQset, queue);
 
@@ -131,7 +133,6 @@ void *dnodeAllocateReadWorker() {
 }
 
 void dnodeFreeReadWorker(void *rqueue) {
-
   taosCloseQueue(rqueue);
 
   // dynamically adjust the number of threads
@@ -144,16 +145,16 @@ static void *dnodeProcessReadQueue(void *param) {
   while (1) {
     if (taosReadQitemFromQset(qset, &readMsg) <= 0) {
       dnodeHandleIdleReadWorker();
-      continue;      
+      continue;
     }
 
     terrno = 0;
     if (dnodeProcessReadMsgFp[readMsg.rpcMsg.msgType]) {
       (*dnodeProcessReadMsgFp[readMsg.rpcMsg.msgType]) (&readMsg);
     } else {
-      terrno = TSDB_CODE_MSG_NOT_PROCESSED;  
+      terrno = TSDB_CODE_MSG_NOT_PROCESSED;
     }
-     
+
     dnodeProcessReadResult(&readMsg);
   }
 
@@ -161,7 +162,7 @@ static void *dnodeProcessReadQueue(void *param) {
 }
 
 static void dnodeHandleIdleReadWorker() {
-  int num = taosGetQueueNumber(readQset);
+  int32_t num = taosGetQueueNumber(readQset);
 
   if (num == 0 || (num <= minThreads && threads > minThreads)) {
     threads--;
@@ -180,10 +181,10 @@ static void dnodeProcessReadResult(SReadMsg *pRead) {
 
   if (pRpcContext) {
     if (terrno) {
-      if (pRpcContext->code == 0) pRpcContext->code = terrno;  
+      if (pRpcContext->code == 0) pRpcContext->code = terrno;
     }
 
-    int count = atomic_add_fetch_32(&pRpcContext->count, 1);
+    int32_t count = atomic_add_fetch_32(&pRpcContext->count, 1);
     if (count < pRpcContext->numOfVnodes) {
       // not over yet, multiple vnodes
       return;
@@ -197,8 +198,8 @@ static void dnodeProcessReadResult(SReadMsg *pRead) {
 
   SRpcMsg rsp;
   rsp.handle = pRead->rpcMsg.handle;
-  rsp.code = code;
-  rsp.pCont = NULL;
+  rsp.code   = code;
+  rsp.pCont  = NULL;
   rpcSendResponse(&rsp);
   rpcFreeCont(pRead->rpcMsg.pCont);  // free the received message
 }

src/dnode/src/dnodeWrite.c

@@ -15,11 +15,11 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "taosmsg.h"
 #include "taoserror.h"
 #include "tlog.h"
-#include "trpc.h"
 #include "tqueue.h"
-#include "taosmsg.h"
+#include "trpc.h"
 #include "dnodeWrite.h"
 #include "dnodeMgmt.h"
 
@@ -31,7 +31,7 @@ typedef struct {
 
 typedef struct _write {
   void        *pCont;
-  int          contLen;
+  int32_t      contLen;
   SRpcMsg      rpcMsg;
   void        *pVnode;      // pointer to vnode
   SRpcContext *pRpcContext; // RPC message context
@@ -40,12 +40,12 @@ typedef struct _write {
 typedef struct {
   taos_qset  qset;      // queue set
   pthread_t  thread;    // thread 
-  int        workerId;  // worker ID
+  int32_t    workerId;  // worker ID
 } SWriteWorker;  
 
 typedef struct _thread_obj {
-  int            max;        // max number of workers
-  int            nextId;     // from 0 to max-1, cyclic
+  int32_t        max;        // max number of workers
+  int32_t        nextId;     // from 0 to max-1, cyclic
   SWriteWorker  *writeWorker;
 } SWriteWorkerPool;
 
@@ -59,16 +59,16 @@ static void   dnodeProcessDropTableMsg(SWriteMsg *pMsg);
 
 SWriteWorkerPool wWorkerPool;
 
-int dnodeInitWrite() {
-  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_SUBMIT] = dnodeProcessSubmitMsg;
-  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_DNODE_CREATE_TABLE] = dnodeProcessCreateTableMsg;
-  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_DNODE_REMOVE_TABLE] = dnodeProcessDropTableMsg;
+int32_t dnodeInitWrite() {
+  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_SUBMIT]             = dnodeProcessSubmitMsg;
+  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = dnodeProcessCreateTableMsg;
+  dnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE] = dnodeProcessDropTableMsg;
 
   wWorkerPool.max = tsNumOfCores;
   wWorkerPool.writeWorker = (SWriteWorker *)calloc(sizeof(SWriteWorker), wWorkerPool.max);
   if (wWorkerPool.writeWorker == NULL) return -1;
 
-  for (int i=0; i<wWorkerPool.max; ++i) {
+  for (int32_t i = 0; i < wWorkerPool.max; ++i) {
     wWorkerPool.writeWorker[i].workerId = i;
   }
 
@@ -76,17 +76,17 @@ int dnodeInitWrite() {
 }
 
 void dnodeCleanupWrite() {
-  
-
   free(wWorkerPool.writeWorker);
 }
 
-void dnodeWrite(SRpcMsg *pMsg) {
-  int     leftLen = pMsg->contLen;
-  char   *pCont = (char *)pMsg->pCont;
-  int     contLen = 0;
-  int     numOfVnodes = 0;
-  int32_t vgId = 0; 
+void dnodeWrite(void *rpcMsg) {
+  SRpcMsg *pMsg = rpcMsg;
+
+  int32_t     leftLen      = pMsg->contLen;
+  char        *pCont       = (char *) pMsg->pCont;
+  int32_t     contLen      = 0;
+  int32_t     numOfVnodes  = 0;
+  int32_t     vgId         = 0;
   SRpcContext *pRpcContext = NULL;
 
   // parse head, get number of vnodes;
@@ -108,11 +108,11 @@ void dnodeWrite(SRpcMsg *pMsg) {
    
     // put message into queue
     SWriteMsg writeMsg;
-    writeMsg.rpcMsg = *pMsg;
-    writeMsg.pCont = pCont;
-    writeMsg.contLen = contLen;
-    writeMsg.pRpcContext = pRpcContext;   
-    writeMsg.pVnode = pVnode;  // pVnode shall be saved for usage later
+    writeMsg.rpcMsg      = *pMsg;
+    writeMsg.pCont       = pCont;
+    writeMsg.contLen     = contLen;
+    writeMsg.pRpcContext = pRpcContext;
+    writeMsg.pVnode      = pVnode;  // pVnode shall be saved for usage later
  
     taos_queue queue = dnodeGetVnodeWworker(pVnode);
     taosWriteQitem(queue, &writeMsg);
@@ -150,7 +150,6 @@ void *dnodeAllocateWriteWorker() {
 }
 
 void dnodeFreeWriteWorker(void *wqueue) {
-
   taosCloseQueue(wqueue);
 
   // dynamically adjust the number of threads
@@ -160,7 +159,7 @@ static void *dnodeProcessWriteQueue(void *param) {
   SWriteWorker *pWorker = (SWriteWorker *)param;
   taos_qall     qall;
   SWriteMsg     writeMsg;
-  int           numOfMsgs;
+  int32_t       numOfMsgs;
 
   while (1) {
     numOfMsgs = taosReadAllQitemsFromQset(pWorker->qset, &qall);
@@ -169,7 +168,7 @@ static void *dnodeProcessWriteQueue(void *param) {
       continue;
     }
 
-    for (int i=0; i<numOfMsgs; ++i) {
+    for (int32_t i=0; i<numOfMsgs; ++i) {
       // retrieve all items, and write them into WAL
       taosGetQitem(qall, &writeMsg);
 
@@ -181,7 +180,7 @@ static void *dnodeProcessWriteQueue(void *param) {
 
     // browse all items, and process them one by one
     taosResetQitems(qall);
-    for (int i=0; i<numOfMsgs; ++i) {
+    for (int32_t i = 0; i < numOfMsgs; ++i) {
       taosGetQitem(qall, &writeMsg);
 
       terrno = 0;
@@ -212,7 +211,7 @@ static void dnodeProcessWriteResult(SWriteMsg *pWrite) {
       if (pRpcContext->code == 0) pRpcContext->code = terrno;  
     }
 
-    int count = atomic_add_fetch_32(&pRpcContext->count, 1);
+    int32_t count = atomic_add_fetch_32(&pRpcContext->count, 1);
     if (count < pRpcContext->numOfVnodes) {
       // not over yet, multiple vnodes
       return;
@@ -226,15 +225,14 @@ static void dnodeProcessWriteResult(SWriteMsg *pWrite) {
 
   SRpcMsg rsp;
   rsp.handle = pWrite->rpcMsg.handle;
-  rsp.code = code;
-  rsp.pCont = NULL;
+  rsp.code   = code;
+  rsp.pCont  = NULL;
   rpcSendResponse(&rsp);
   rpcFreeCont(pWrite->rpcMsg.pCont);  // free the received message
 }
 
 static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
-
-  int num = taosGetQueueNumber(pWorker->qset);
+  int32_t num = taosGetQueueNumber(pWorker->qset);
 
   if (num > 0) {
      usleep(100);
@@ -248,15 +246,12 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
 
 static void dnodeProcessSubmitMsg(SWriteMsg *pMsg) {
 
-  
 }
 
 static void dnodeProcessCreateTableMsg(SWriteMsg *pMsg) {
 
-
 }
 
 static void dnodeProcessDropTableMsg(SWriteMsg *pMsg) {
 
-
 }

src/inc/mnode.h

@@ -47,8 +47,6 @@ extern void *tsMgmtTmr;
 extern void *tsMgmtTranQhandle;
 extern char  tsMgmtDirectory[];
 
-extern int tsDbUpdateSize;
-
 typedef struct {
   uint32_t   privateIp;
   int32_t    sid;
@@ -263,8 +261,6 @@ int32_t mgmtStartSystem();
 void    mgmtCleanUpSystem();
 void    mgmtStopSystem();
 
-void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code);
-void dnodeProcessMsgFromMgmt(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code);
 
 #ifdef __cplusplus
 }

src/inc/taosmsg.h

@@ -37,31 +37,39 @@ extern "C" {
 #define TSDB_MSG_TYPE_QUERY_RSP              6
 #define TSDB_MSG_TYPE_RETRIEVE               7
 #define TSDB_MSG_TYPE_RETRIEVE_RSP           8
-#define TSDB_MSG_TYPE_DNODE_CREATE_TABLE     9
-#define TSDB_MSG_TYPE_DNODE_CREATE_TABLE_RSP 10
-#define TSDB_MSG_TYPE_DNODE_REMOVE_TABLE     11
-#define TSDB_MSG_TYPE_DNODE_REMOVE_TABLE_RSP 12
-
-// dnodeMgmt
-#define TSDB_MSG_TYPE_CREATE_VNODE           13
-#define TSDB_MSG_TYPE_CREATE_VNODE_RSP       14
-#define TSDB_MSG_TYPE_DROP_VNODE             15
-#define TSDB_MSG_TYPE_DROP_VNODE_RSP         16
-#define TSDB_MSG_TYPE_ALTER_VNODE            17
-#define TSDB_MSG_TYPE_ALTER_VNODE_RSP        18
-#define TSDB_MSG_TYPE_CONFIG_VNODE           19
-#define TSDB_MSG_TYPE_CONFIG_VNODE_RSP       20
-
-#define TSDB_MSG_TYPE_DNODE_CFG              17
-#define TSDB_MSG_TYPE_DNODE_CFG_RSP          18
-#define TSDB_MSG_TYPE_DNODE_ALTER_STREAM     19
-#define TSDB_MSG_TYPE_DNODE_ALTER_STREAM_RSP 20
+
+// message from mgmt to dnode
+#define TSDB_MSG_TYPE_MD_CREATE_TABLE        9
+#define TSDB_MSG_TYPE_MD_CREATE_TABLE_RSP    10
+#define TSDB_MSG_TYPE_MD_DROP_TABLE          11
+#define TSDB_MSG_TYPE_MD_DROP_TABLE_RSP      12
+#define TSDB_MSG_TYPE_MD_ALTER_TABLE         13
+#define TSDB_MSG_TYPE_MD_ALTER_TABLE_RSP     14
+#define TSDB_MSG_TYPE_MD_CREATE_VNODE        15
+#define TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP    16
+#define TSDB_MSG_TYPE_MD_DROP_VNODE          17
+#define TSDB_MSG_TYPE_MD_DROP_VNODE_RSP      18
+#define TSDB_MSG_TYPE_MD_ALTER_VNODE         19
+#define TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP     20
+#define TSDB_MSG_TYPE_MD_DROP_STABLE         21
+#define TSDB_MSG_TYPE_MD_DROP_STABLE_RSP     22
+#define TSDB_MSG_TYPE_MD_ALTER_STREAM        23
+#define TSDB_MSG_TYPE_MD_ALTER_STREAM_RSP    24
+#define TSDB_MSG_TYPE_MD_CONFIG_DNODE        25
+#define TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP    26
+
+
+#define TSDB_MSG_TYPE_CM_CONFIG_DNODE        TSDB_MSG_TYPE_MD_CONFIG_DNODE
+#define TSDB_MSG_TYPE_CM_CONFIG_DNODE_RSP    TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP
+
+#define TSDB_MSG_TYPE_DM_CONFIG_VNODE           19
+#define TSDB_MSG_TYPE_DM_CONFIG_VNODE_RSP       20
+
+
 #define TSDB_MSG_TYPE_SDB_SYNC               21
 #define TSDB_MSG_TYPE_SDB_SYNC_RSP           22
 #define TSDB_MSG_TYPE_SDB_FORWARD            23
 #define TSDB_MSG_TYPE_SDB_FORWARD_RSP        24
-#define TSDB_MSG_TYPE_DROP_STABLE            25
-#define TSDB_MSG_TYPE_DROP_STABLE_RSP        26
 #define TSDB_MSG_TYPE_CONNECT                31
 #define TSDB_MSG_TYPE_CONNECT_RSP            32
 #define TSDB_MSG_TYPE_CREATE_ACCT            33
@@ -259,7 +267,7 @@ typedef struct {
   char       tableId[TSDB_TABLE_ID_LEN + 1];
   char       superTableId[TSDB_TABLE_ID_LEN + 1];
   char       data[];
-} SDCreateTableMsg;
+} SDMCreateTableMsg;
 
 typedef struct {
   char      tableId[TSDB_TABLE_ID_LEN + 1];
@@ -341,7 +349,7 @@ typedef struct {
   uint64_t   uid;
   SVPeerDesc vpeerDesc[TSDB_MAX_MPEERS];
   char       tableId[TSDB_TABLE_ID_LEN + 1];
-} SDRemoveTableMsg;
+} SMDDropTableMsg;
 
 typedef struct {
   char    tableId[TSDB_TABLE_ID_LEN + 1];
@@ -349,8 +357,9 @@ typedef struct {
 } SDRemoveSuperTableMsg;
 
 typedef struct {
+  int32_t vgId;
   int32_t vnode;
-} SFreeVnodeMsg;
+} SMDDropVnodeMsg;
 
 typedef struct SColIndexEx {
   int16_t colId;
@@ -622,7 +631,7 @@ typedef struct {
   int32_t    vnode;
   SVnodeCfg  cfg;
   SVPeerDesc vpeerDesc[TSDB_MAX_MPEERS];
-} SCreateVnodeMsg;
+} SMDCreateVnodeMsg;
 
 typedef struct {
   char    tableId[TSDB_TABLE_ID_LEN + 1];
@@ -751,7 +760,7 @@ typedef struct {
 typedef struct {
   char ip[32];
   char config[64];
-} SCfgDnodeMsg;
+} SMDCfgDnodeMsg, SCMCfgDnodeMsg;
 
 typedef struct {
   char     sql[TSDB_SHOW_SQL_LEN + 1];

src/mnode/inc/mgmtAcct.h

@@ -19,28 +19,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 #include "mnode.h"
 
-int32_t mgmtInitAccts();
-void mgmtCleanUpAccts();
+int32_t   mgmtInitAccts();
+void      mgmtCleanUpAccts();
 SAcctObj *mgmtGetAcct(char *acctName);
 
 int32_t mgmtCheckUserLimit(SAcctObj *pAcct);
 int32_t mgmtCheckDbLimit(SAcctObj *pAcct);
 int32_t mgmtCheckTableLimit(SAcctObj *pAcct, int32_t numOfTimeSeries);
-int32_t mgmtGetAcctMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveAccts(SShowObj *pShow, char *data, int32_t rows, void *pConn);
 
 int32_t mgmtAddDbIntoAcct(SAcctObj *pAcct, SDbObj *pDb);
 int32_t mgmtRemoveDbFromAcct(SAcctObj *pAcct, SDbObj *pDb);
 int32_t mgmtAddUserIntoAcct(SAcctObj *pAcct, SUserObj *pUser);
 int32_t mgmtRemoveUserFromAcct(SAcctObj *pAcct, SUserObj *pUser);
 
-extern int32_t (*mgmtCreateAcctFp)(char *name, char *pass, SAcctCfg *pCfg);
-extern int32_t (*mgmtDropAcctFp)(char *name);
-extern int32_t (*mgmtAlterAcctFp)(char *name, char *pass, SAcctCfg *pCfg);
-
 #ifdef __cplusplus
 }
 #endif

src/mnode/inc/mgmtBalance.h

@@ -19,13 +19,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 #include "mnode.h"
 
 int32_t mgmtInitBalance();
 void    mgmtCleanupBalance();
 int32_t mgmtAllocVnodes(SVgObj *pVgroup);
-char*   mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtChildTable.h

@@ -31,7 +31,7 @@ void    mgmtCleanUpChildTables();
 void *  mgmtGetChildTable(char *tableId);
 
 int32_t mgmtCreateChildTable(SCreateTableMsg *pCreate, int32_t contLen, SVgObj *pVgroup, int32_t sid,
-                             SDCreateTableMsg **pDCreateOut, STableInfo **pTableOut);
+                             SDMCreateTableMsg **pDCreateOut, STableInfo **pTableOut);
 int32_t mgmtDropChildTable(SDbObj *pDb, SChildTableObj *pTable);
 int32_t mgmtModifyChildTableTagValueByName(SChildTableObj *pTable, char *tagName, char *nContent);
 

src/mnode/inc/mgmtDClient.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_MGMT_DCLIENT_H
+#define TDENGINE_MGMT_DCLIENT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t mgmtInitDClient();
+void    mgmtCleanupDClient();
+void    mgmtAddDClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
+void    mgmtSendMsgToDnode(SRpcIpSet *ipSet, SRpcMsg *rpcMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/mnode/inc/mgmtDnodeInt.h → src/mnode/inc/mgmtDServer.h

@@ -13,33 +13,31 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_MGMT_DNODE_INT_H
-#define TDENGINE_MGMT_DNODE_INT_H
+#ifndef TDENGINE_MGMT_DSERVER_H
+#define TDENGINE_MGMT_DSERVER_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "mnode.h"
-
-extern void *mgmtStatusTimer;
-
-void mgmtSendCreateTableMsg(SDCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle);
-void mgmtSendRemoveTableMsg(SDRemoveTableMsg *pRemove, SRpcIpSet *ipSet, void *ahandle);
-void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle);
-void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle);
-void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
-void mgmtSendOneFreeVnodeMsg(int32_t vnode, SRpcIpSet *ipSet, void *ahandle);
-void mgmtSendRemoveVgroupMsg(SVgObj *pVgroup, void *ahandle);
-
-int32_t mgmtInitDnodeInt();
-void    mgmtCleanUpDnodeInt();
-
-void mgmtSendMsgToDnode(SRpcIpSet *ipSet, int8_t msgType, void *pCont, int32_t contLen, void *ahandle);
-void mgmtSendRspToDnode(void *pConn, int8_t msgType, int32_t code, void *pCont, int32_t contLen);
-void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code);
+int32_t mgmtInitDServer();
+void    mgmtCleanupDServer();
+void    mgmtAddDServerMsgHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
+
+
+//extern void *mgmtStatusTimer;
+//
+//void mgmtSendCreateTableMsg(SDMCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle);
+//void mgmtSendDropTableMsg(SMDDropTableMsg *pRemove, SRpcIpSet *ipSet, void *ahandle);
+//void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle);
+//void mgmtSendDropVnodeMsg(int32_t vnode, SRpcIpSet *ipSet, void *ahandle);
+//
+//int32_t mgmtInitDnodeInt();
+//void    mgmtCleanUpDnodeInt();
+//
+//void mgmtSendMsgToDnode(SRpcIpSet *ipSet, int8_t msgType, void *pCont, int32_t contLen, void *ahandle);
+//void mgmtSendRspToDnode(void *pConn, int8_t msgType, int32_t code, void *pCont, int32_t contLen);
+//void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtDb.h

@@ -22,24 +22,16 @@ extern "C" {
 
 #include "mnode.h"
 
-void    mgmtMonitorDbDrop(void *unused, void *unusedt);
-int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter);
 int32_t mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup);
 int32_t mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup);
 int32_t mgmtRemoveVgroupFromDb(SDbObj *pDb, SVgObj *pVgroup);
 int32_t mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup);
 int32_t mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup);
-int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-void    mgmtCleanUpDbs();
 
 int32_t mgmtInitDbs();
-int32_t mgmtUpdateDb(SDbObj *pDb);
+void    mgmtCleanUpDbs();
 SDbObj *mgmtGetDb(char *db);
 SDbObj *mgmtGetDbByTableId(char *db);
-int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate);
-int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists);
-int32_t mgmtDropDb(SDbObj *pDb);
 bool    mgmtCheckIsMonitorDB(char *db, char *monitordb);
 
 void mgmtAddSuperTableIntoDb(SDbObj *pDb);

src/mnode/inc/mgmtDnode.h

@@ -19,46 +19,22 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#include <stdint.h>
-#include <stdbool.h>
 #include "mnode.h"
 
-void    mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes, int32_t vgId);
-void    mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes);
-int32_t mgmtGetDnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-int32_t mgmtSendCfgDnodeMsg(char *cont);
-void    mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode);
-
-int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-bool    mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType);
-int32_t mgmtGetModuleMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-int32_t mgmtGetScoresMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
 int32_t mgmtInitDnodes();
 void    mgmtCleanUpDnodes();
 int32_t mgmtGetDnodesNum();
 int32_t mgmtUpdateDnode(SDnodeObj *pDnode);
-void*   mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode);
-bool    mgmtCheckConfigShow(SGlobalConfig *cfg);
-bool    mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode);
-bool    mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode);
-void    mgmtSetDnodeUnRemove(SDnodeObj *pDnode);
 SDnodeObj* mgmtGetDnode(uint32_t ip);
 
-extern  int32_t (*mgmtCreateDnodeFp)(uint32_t ip);
-extern  int32_t (*mgmtDropDnodeByIpFp)(uint32_t ip);
-
+bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode);
+bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode);
+bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType);
+void mgmtSetDnodeUnRemove(SDnodeObj *pDnode);
+void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode);
 void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode);
+void mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes, int32_t vgId);
+void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtGrant.h

@@ -19,9 +19,6 @@
 #ifdef __cplusplus
 "C" {
 #endif
-
-#include <stdint.h>
-#include <stdbool.h>
 #include "mnode.h"
 
 bool    mgmtCheckExpired();
@@ -30,11 +27,6 @@ void    mgmtRestoreTimeSeries(SAcctObj *pAcct, uint32_t timeseries);
 int32_t mgmtCheckTimeSeries(uint32_t timeseries);
 int32_t mgmtCheckUserGrant();
 int32_t mgmtCheckDbGrant();
-int32_t mgmtCheckDnodeGrant();
-int32_t mgmtGetGrantsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveGrants(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-extern void (*mgmtUpdateGrantInfoFp)(void *pCont);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtMnode.h

@@ -20,15 +20,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "mnode.h"
-
-int32_t mgmtAddMnode(uint32_t privateIp, uint32_t publicIp);
-int32_t mgmtRemoveMnode(uint32_t privateIp);
-
-int32_t mgmtGetMnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+bool mgmtCheckRedirect(void *handle);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtNormalTable.h

@@ -29,7 +29,7 @@ void    mgmtCleanUpNormalTables();
 void *  mgmtGetNormalTable(char *tableId);
 
 int32_t mgmtCreateNormalTable(SCreateTableMsg *pCreate, int32_t contLen, SVgObj *pVgroup, int32_t sid,
-                              SDCreateTableMsg **pDCreateOut, STableInfo **pTableOut);
+                              SDMCreateTableMsg **pDCreateOut, STableInfo **pTableOut);
 int32_t mgmtDropNormalTable(SDbObj *pDb, SNormalTableObj *pTable);
 int32_t mgmtAddNormalTableColumn(SNormalTableObj *pTable, SSchema schema[], int32_t ncols);
 int32_t mgmtDropNormalTableColumnByName(SNormalTableObj *pTable, char *colName);

src/mnode/inc/mgmtProfile.h

@@ -19,27 +19,15 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 #include "mnode.h"
 
+int32_t mgmtInitProfile();
+void    mgmtCleanUpProfile();
+
 bool mgmtCheckQhandle(uint64_t qhandle);
 void mgmtSaveQhandle(void *qhandle);
 void mgmtFreeQhandle(void *qhandle);
 
-int32_t mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg);
-int32_t mgmtGetQueryMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-int32_t mgmtGetStreamMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-int32_t mgmtGetConnsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
-int32_t mgmtKillQuery(char *qidstr, void *pConn);
-int32_t mgmtKillStream(char *qidstr, void *pConn);
-int32_t mgmtKillConnection(char *qidstr, void *pConn);
-
 enum {
   TSDB_PROCESS_CREATE_VGROUP,
   TSDB_PROCESS_CREATE_VGROUP_GET_META,

src/mnode/inc/mgmtShell.h

@@ -19,30 +19,16 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#include <stdint.h>
-#include <stdbool.h>
 #include "mnode.h"
 
-int32_t  mgmtInitShell();
+int32_t mgmtInitShell();
 void mgmtCleanUpShell();
+void mgmtAddShellMsgHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
 
-extern int32_t (*mgmtCheckRedirectMsg)(void *pConn);
-
-/*
- * If table not exist, will create it
- */
-void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle);
-
-/*
- * If vgroup not exist, will create vgroup
- */
-void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta);
-
-/*
- * If vgroup create returned, will then create table
- */
-void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta);
+typedef int32_t (*SShowMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+typedef int32_t (*SShowRetrieveFp)(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+void mgmtAddShellShowMetaHandle(uint8_t showType, SShowMetaFp fp);
+void mgmtAddShellShowRetrieveHandle(uint8_t showType, SShowRetrieveFp fp);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtSuperTable.h

@@ -30,8 +30,6 @@ int32_t mgmtInitSuperTables();
 void    mgmtCleanUpSuperTables();
 
 void *  mgmtGetSuperTable(char *tableId);
-int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
 
 int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate);
 int32_t mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pTable);

src/mnode/inc/mgmtTable.h

@@ -26,7 +26,9 @@ extern "C" {
 #include "mnode.h"
 
 int32_t     mgmtInitTables();
+void        mgmtCleanUpTables();
 STableInfo* mgmtGetTable(char *tableId);
+
 STableInfo* mgmtGetTableByPos(uint32_t dnodeIp, int32_t vnode, int32_t sid);
 int32_t     mgmtGetTableMeta(SDbObj *pDb, STableInfo *pTable, STableMeta *pMeta, bool usePublicIp);
 
@@ -34,17 +36,17 @@ int32_t  mgmtRetrieveMetricMeta(void *pConn, char **pStart, SSuperTableMetaMsg *
 int32_t  mgmtCreateTable(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta);
 int32_t  mgmtDropTable(SDbObj *pDb, char *tableId, int32_t ignore);
 int32_t  mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter);
-int32_t  mgmtGetShowTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t  mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-void     mgmtCleanUpMeters();
 
 void    mgmtAddTableIntoSuperTable(SSuperTableObj *pStable);
 void    mgmtRemoveTableFromSuperTable(SSuperTableObj *pStable);
 void    mgmtSetTableDirty(STableInfo *pTable, bool isDirty);
 
-SDRemoveTableMsg *mgmtBuildRemoveTableMsg(STableInfo *pTable);
+SMDDropTableMsg *mgmtBuildRemoveTableMsg(STableInfo *pTable);
 SDRemoveSuperTableMsg *mgmtBuildRemoveSuperTableMsg(STableInfo *pTable);
 
+void mgmtProcessGetTableMeta(STableInfo *pTable, void *thandle);
+void mgmtProcessCreateTable(SVgObj *pVgroup, SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta);
+void mgmtProcessCreateVgroup(SCreateTableMsg *pCreate, int32_t contLen, void *thandle, bool isGetMeta);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtUser.h

@@ -19,19 +19,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#include <stdint.h>
-#include <stdbool.h>
 #include "mnode.h"
 
 int32_t   mgmtInitUsers();
-SUserObj *mgmtGetUser(char *name);
-int32_t   mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass);
-int32_t   mgmtDropUser(SAcctObj *pAcct, char *name);
-int32_t   mgmtUpdateUser(SUserObj *pUser);
-int32_t   mgmtGetUserMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t   mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn);
 void      mgmtCleanUpUsers();
+SUserObj *mgmtGetUser(char *name);
 SUserObj *mgmtGetUserFromConn(void *pConn);
 
 #ifdef __cplusplus

src/mnode/inc/mgmtVgroup.h

@@ -33,16 +33,15 @@ SVgObj *mgmtCreateVgroup(SDbObj *pDb);
 int32_t mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup);
 void    mgmtUpdateVgroup(SVgObj *pVgroup);
 
-int32_t mgmtGetVgroupMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
-int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn);
-
 void    mgmtSetVgroupIdPool();
 SVgObj *mgmtGetAvailableVgroup(SDbObj *pDb);
 
 void    mgmtAddTableIntoVgroup(SVgObj *pVgroup, STableInfo *pTable);
 void    mgmtRemoveTableFromVgroup(SVgObj *pVgroup, STableInfo *pTable);
 
-SCreateVnodeMsg *mgmtBuildVpeersMsg(SVgObj *pVgroup, int32_t vnode);
+SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode);
+void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle);
+void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
 
 SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup);
 SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip);

src/mnode/src/mgmtAcct.c

@@ -15,30 +15,16 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "tschemautil.h"
-#include "taoserror.h"
-#include "mnode.h"
 #include "mgmtAcct.h"
-#include "mgmtTable.h"
-#include "mgmtUser.h"
 
-extern void *tsUserSdb;
-extern void *tsDbSdb;
 static SAcctObj tsAcctObj;
 
-int32_t (*mgmtInitAcctsFp)() = NULL;
-void (*mgmtCleanUpAcctsFp)() = NULL;
-
-int32_t (*mgmtCreateAcctFp)(char *name, char *pass, SAcctCfg *pCfg) = NULL;
-int32_t (*mgmtDropAcctFp)(char *name) = NULL;
-int32_t (*mgmtAlterAcctFp)(char *name, char *pass, SAcctCfg *pCfg) = NULL;
-int32_t (*mgmtGetAcctMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn) = NULL;
-int32_t (*mgmtRetrieveAcctsFp)(SShowObj *pShow, char *data, int32_t rows, void *pConn) = NULL;
+int32_t   (*mgmtInitAcctsFp)() = NULL;
+void      (*mgmtCleanUpAcctsFp)() = NULL;
 SAcctObj *(*mgmtGetAcctFp)(char *acctName) = NULL;
-
-int32_t (*mgmtCheckUserLimitFp)(SAcctObj *pAcct) = NULL;
-int32_t (*mgmtCheckDbLimitFp)(SAcctObj *pAcct) = NULL;
-int32_t (*mgmtCheckTimeSeriesLimitFp)(SAcctObj *pAcct, int32_t numOfTimeSeries) = NULL;
+int32_t   (*mgmtCheckUserLimitFp)(SAcctObj *pAcct) = NULL;
+int32_t   (*mgmtCheckDbLimitFp)(SAcctObj *pAcct) = NULL;
+int32_t   (*mgmtCheckTimeSeriesLimitFp)(SAcctObj *pAcct, int32_t numOfTimeSeries) = NULL;
 
 int32_t mgmtAddDbIntoAcct(SAcctObj *pAcct, SDbObj *pDb) {
   pthread_mutex_lock(&pAcct->mutex);
@@ -113,88 +99,47 @@ int32_t mgmtRemoveUserFromAcct(SAcctObj *pAcct, SUserObj *pUser) {
 
 int32_t mgmtInitAccts() {
   if (mgmtInitAcctsFp) {
-    return mgmtInitAcctsFp();
+    return (*mgmtInitAcctsFp)();
   } else {
-    SAcctObj *pAcct = &tsAcctObj;
-    pAcct->acctId = 0;
-    strcpy(pAcct->user, "root");
+    tsAcctObj.acctId = 0;
+    strcpy(tsAcctObj.user, "root");
     return 0;
   }
 }
 
 SAcctObj *mgmtGetAcct(char *acctName) {
   if (mgmtGetAcctFp) {
-    return mgmtGetAcctFp(acctName);
+    return (*mgmtGetAcctFp)(acctName);
   } else {
     return &tsAcctObj;
   }
 }
 
+void mgmtCleanUpAccts() {
+  if (mgmtCleanUpAcctsFp) {
+    (*mgmtCleanUpAcctsFp)();
+  }
+}
+
 int32_t mgmtCheckUserLimit(SAcctObj *pAcct) {
   if (mgmtCheckUserLimitFp) {
-    return mgmtCheckUserLimitFp(pAcct);
-  } else {
-    int32_t numOfUsers = sdbGetNumOfRows(tsUserSdb);
-    if (numOfUsers >= tsMaxUsers) {
-      mWarn("numOfUsers:%d, exceed tsMaxUsers:%d", numOfUsers, tsMaxUsers);
-      return TSDB_CODE_TOO_MANY_USERS;
-    }
-    return 0;
+    return (*mgmtCheckUserLimitFp)(pAcct);
   }
+  return 0;
 }
 
 int32_t mgmtCheckDbLimit(SAcctObj *pAcct) {
   if (mgmtCheckDbLimitFp) {
-    return mgmtCheckDbLimitFp(pAcct);
+    return (*mgmtCheckDbLimitFp)(pAcct);
   } else {
-    int32_t numOfDbs = sdbGetNumOfRows(tsDbSdb);
-    if (numOfDbs >= tsMaxDbs) {
-      mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs);
-      return TSDB_CODE_TOO_MANY_DATABASES;
-    }
     return 0;
   }
 }
 
 int32_t mgmtCheckTableLimit(SAcctObj *pAcct, int32_t numOfTimeSeries) {
   if (mgmtCheckTimeSeriesLimitFp) {
-    return mgmtCheckTimeSeriesLimitFp(pAcct, numOfTimeSeries);
+    return (*mgmtCheckTimeSeriesLimitFp)(pAcct, numOfTimeSeries);
   } else {
     return 0;
   }
-}
-
-void mgmtCleanUpAccts() {
-  if (mgmtCleanUpAcctsFp) {
-    mgmtCleanUpAcctsFp();
-  }
-}
-
-int32_t mgmtGetAcctMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
-  if (mgmtGetAcctMetaFp) {
-    return mgmtGetAcctMetaFp(pMeta, pShow, pConn);
-  } else {
-    return TSDB_CODE_OPS_NOT_SUPPORT;
-  }
-}
-
-int32_t mgmtRetrieveAccts(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-  if (mgmtRetrieveAcctsFp) {
-    return mgmtRetrieveAcctsFp(pShow, data, rows, pConn);
-  } else {
-    return 0;
-  }
-}
-
-SAcctObj *mgmtGetAcctFromConn(void *pConn) {
-  SRpcConnInfo connInfo;
-  rpcGetConnInfo(pConn, &connInfo);
-
-  SUserObj *pUser = mgmtGetUser(connInfo.user);
-  if (pUser != NULL) {
-    return pUser->pAcct;
-  }
-
-  return NULL;
-}
-
+}
\ No newline at end of file

src/mnode/src/mgmtBalance.c

@@ -14,24 +14,13 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "tglobalcfg.h"
-#include "tmodule.h"
 #include "tstatus.h"
-#include "ttime.h"
 #include "mgmtBalance.h"
 #include "mgmtDnode.h"
 
-void    (*mgmtStartBalanceTimerFp)(int64_t mseconds) = NULL;
 int32_t (*mgmtInitBalanceFp)() = NULL;
 void    (*mgmtCleanupBalanceFp)() = NULL;
 int32_t (*mgmtAllocVnodesFp)(SVgObj *pVgroup) = NULL;
-char *  (*mgmtGetVnodeStatusFp)(SVgObj *pVgroup, SVnodeGid *pVnode) = NULL;
-
-void mgmtStartBalanceTimer(int64_t mseconds) {
-  if (mgmtStartBalanceTimerFp) {
-    (*mgmtStartBalanceTimerFp)(mseconds);
-  }
-}
 
 int32_t mgmtInitBalance() {
   if (mgmtInitBalanceFp) {
@@ -55,11 +44,11 @@ int32_t mgmtAllocVnodes(SVgObj *pVgroup) {
   SDnodeObj *pDnode = mgmtGetDnode(0);
   if (pDnode == NULL) return TSDB_CODE_OTHERS;
 
-  int selectedVnode = -1;
-  int lastAllocVode = pDnode->lastAllocVnode;
+  int32_t selectedVnode = -1;
+  int32_t lastAllocVode = pDnode->lastAllocVnode;
 
-  for (int i = 0; i < pDnode->numOfVnodes; i++) {
-    int vnode = (i + lastAllocVode) % pDnode->numOfVnodes;
+  for (int32_t i = 0; i < pDnode->numOfVnodes; i++) {
+    int32_t vnode = (i + lastAllocVode) % pDnode->numOfVnodes;
     if (pDnode->vload[vnode].vgId == 0 && pDnode->vload[vnode].status == TSDB_VN_STATUS_OFFLINE) {
       selectedVnode = vnode;
       break;

src/mnode/src/mgmtChildTable.c

@@ -26,9 +26,10 @@
 #include "mgmtAcct.h"
 #include "mgmtChildTable.h"
 #include "mgmtDb.h"
-#include "mgmtDnodeInt.h"
 #include "mgmtGrant.h"
 #include "mgmtProfile.h"
+#include "mgmtShell.h"
+#include "mgmtDClient.h"
 #include "mgmtSuperTable.h"
 #include "mgmtTable.h"
 #include "mgmtVgroup.h"
@@ -273,9 +274,9 @@ void mgmtCleanUpChildTables() {
 
 static void *mgmtBuildCreateChildTableMsg(SChildTableObj *pTable, SVgObj *pVgroup, void *pTagData, int32_t tagDataLen) {
   int32_t totalCols = pTable->superTable->numOfColumns + pTable->superTable->numOfTags;
-  int32_t contLen   = sizeof(SDCreateTableMsg) + totalCols * sizeof(SSchema) + tagDataLen;
+  int32_t contLen   = sizeof(SDMCreateTableMsg) + totalCols * sizeof(SSchema) + tagDataLen;
 
-  SDCreateTableMsg *pCreateTable = rpcMallocCont(contLen);
+  SDMCreateTableMsg *pCreateTable = rpcMallocCont(contLen);
   if (pCreateTable == NULL) {
     return NULL;
   }
@@ -308,13 +309,13 @@ static void *mgmtBuildCreateChildTableMsg(SChildTableObj *pTable, SVgObj *pVgrou
     pSchema++;
   }
 
-  memcpy(pCreateTable + sizeof(SDCreateTableMsg) + totalCols * sizeof(SSchema), pTagData, tagDataLen);
+  memcpy(pCreateTable + sizeof(SDMCreateTableMsg) + totalCols * sizeof(SSchema), pTagData, tagDataLen);
 
   return pCreateTable;
 }
 
 int32_t mgmtCreateChildTable(SCreateTableMsg *pCreate, int32_t contLen, SVgObj *pVgroup, int32_t sid,
-                             SDCreateTableMsg **pDCreateOut, STableInfo **pTableOut) {
+                             SDMCreateTableMsg **pDCreateOut, STableInfo **pTableOut) {
   int32_t numOfTables = sdbGetNumOfRows(tsChildTableSdb);
   if (numOfTables >= tsMaxTables) {
     mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->tableId, numOfTables, tsMaxTables);
@@ -371,7 +372,7 @@ int32_t mgmtDropChildTable(SDbObj *pDb, SChildTableObj *pTable) {
     return TSDB_CODE_OTHERS;
   }
 
-  SDRemoveTableMsg *pRemove = rpcMallocCont(sizeof(SDRemoveTableMsg));
+  SMDDropTableMsg *pRemove = rpcMallocCont(sizeof(SMDDropTableMsg));
   if (pRemove == NULL) {
     mError("table:%s, failed to drop child table, no enough memory", pTable->tableId);
     return TSDB_CODE_SERV_OUT_OF_MEMORY;
@@ -388,7 +389,16 @@ int32_t mgmtDropChildTable(SDbObj *pDb, SChildTableObj *pTable) {
   }
 
   SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup);
-  mgmtSendRemoveTableMsg(pRemove, &ipSet, NULL);
+
+  mTrace("table:%s, send drop table msg", pRemove->tableId);
+  SRpcMsg rpcMsg = {
+    .handle  = 0,
+    .pCont   = pRemove,
+    .contLen = sizeof(SMDDropTableMsg),
+    .code    = 0,
+    .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE
+  };
+  mgmtSendMsgToDnode(&ipSet, &rpcMsg);
 
   if (sdbDeleteRow(tsChildTableSdb, pTable) < 0) {
     mError("table:%s, update ctables sdb error", pTable->tableId);

src/mnode/src/mgmtDClient.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tsched.h"
+#include "tstatus.h"
+#include "tsystem.h"
+#include "tutil.h"
+#include "dnode.h"
+#include "mnode.h"
+#include "mgmtBalance.h"
+#include "mgmtDb.h"
+#include "mgmtDnode.h"
+#include "mgmtGrant.h"
+#include "mgmtProfile.h"
+#include "mgmtShell.h"
+#include "mgmtTable.h"
+#include "mgmtVgroup.h"
+
+static void   mgmtProcessRspFromDnode(SRpcMsg *rpcMsg);
+static void (*mgmtProcessDnodeRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *rpcMsg);
+static void  *tsMgmtDClientRpc = NULL;
+
+int32_t mgmtInitDClient() {
+  SRpcInit rpcInit = {0};
+  rpcInit.localIp      = tsAnyIp ? "0.0.0.0" : tsPrivateIp;
+  rpcInit.localPort    = 0;
+  rpcInit.label        = "MND-DC";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = mgmtProcessRspFromDnode;
+  rpcInit.sessions     = tsMaxDnodes * 5;
+  rpcInit.connType     = TAOS_CONN_CLIENT;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
+  rpcInit.user         = "mgmtDClient";
+  rpcInit.ckey         = "key";
+  rpcInit.secret       = "secret";
+
+  tsMgmtDClientRpc = rpcOpen(&rpcInit);
+  if (tsMgmtDClientRpc == NULL) {
+    mError("failed to init client connection to dnode");
+    return -1;
+  }
+
+  mPrint("client connection to dnode is opened");
+  return 0;
+}
+
+void mgmtCleanupDClient() {
+  if (tsMgmtDClientRpc) {
+    rpcClose(tsMgmtDClientRpc);
+    tsMgmtDClientRpc = NULL;
+  }
+}
+
+void mgmtAddDClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) {
+  mgmtProcessDnodeRspFp[msgType] = fp;
+}
+
+void mgmtSendMsgToDnode(SRpcIpSet *ipSet, SRpcMsg *rpcMsg) {
+  rpcSendRequest(tsMgmtDClientRpc, ipSet, rpcMsg);
+}
+
+static void mgmtProcessRspFromDnode(SRpcMsg *rpcMsg) {
+  if (mgmtProcessDnodeRspFp[rpcMsg->msgType]) {
+    (*mgmtProcessDnodeRspFp[rpcMsg->msgType])(rpcMsg);
+  } else {
+    dError("%s is not processed", taosMsg[rpcMsg->msgType]);
+  }
+
+  rpcFreeCont(rpcMsg->pCont);
+}
+
+
+//static void mgmtProcessCreateTableRsp(SRpcMsg *rpcMsg) {
+//  mTrace("create table rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//  if (rpcMsg->handle == NULL) return;
+//
+//  SProcessInfo *info = rpcMsg->handle;
+//  assert(info->type == TSDB_PROCESS_CREATE_TABLE || info->type == TSDB_PROCESS_CREATE_TABLE_GET_META);
+//
+//  STableInfo *pTable = info->ahandle;
+//  if (rpcMsg->code != TSDB_CODE_SUCCESS) {
+//    mError("table:%s, failed to create in dnode, code:%d, set it dirty", pTable->tableId, rpcMsg->code);
+//    mgmtSetTableDirty(pTable, true);
+//  } else {
+//    mTrace("table:%s, created in dnode", pTable->tableId);
+//    mgmtSetTableDirty(pTable, false);
+//  }
+//
+//  if (rpcMsg->code != TSDB_CODE_SUCCESS) {
+//    SRpcMsg rpcRsp = {.handle = info->thandle, .pCont = NULL, .contLen = 0, .code = rpcMsg->code, .msgType = 0};
+//    rpcSendResponse(&rpcMsg);
+//  } else {
+//    if (info->type == TSDB_PROCESS_CREATE_TABLE_GET_META) {
+//      mTrace("table:%s, start to process get meta", pTable->tableId);
+//      mgmtProcessGetTableMeta(pTable, rpcMsg->handle);
+//    } else {
+//      SRpcMsg rpcRsp = {.handle = info->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+//      rpcSendResponse(&rpcMsg);
+//    }
+//  }
+//
+//  free(info);
+//}
+//
+//static void mgmtProcessDropTableRsp(SRpcMsg *rpcMsg) {
+//  mTrace("drop table rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessAlterTableRsp(SRpcMsg *rpcMsg) {
+//  mTrace("alter table rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
+//  mTrace("create vnode rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//  if (rpcMsg->handle == NULL) return;
+//
+//  SProcessInfo *info = rpcMsg->handle;
+//  assert(info->type == TSDB_PROCESS_CREATE_VGROUP || info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META);
+//
+//  info->received++;
+//  SVgObj *pVgroup = info->ahandle;
+//
+//  bool isGetMeta = false;
+//  if (info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META) {
+//    isGetMeta = true;
+//  }
+//
+//  mTrace("vgroup:%d, received:%d numOfVnodes:%d", pVgroup->vgId, info->received, pVgroup->numOfVnodes);
+//  if (info->received == pVgroup->numOfVnodes) {
+//    mgmtProcessCreateTable(pVgroup, info->cont, info->contLen, info->thandle, isGetMeta);
+//    free(info);
+//  }
+//}
+//
+//static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg) {
+//  mTrace("drop vnode rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessAlterVnodeRsp(SRpcMsg *rpcMsg) {
+//  mTrace("alter vnode rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessDropStableRsp(SRpcMsg *rpcMsg) {
+//  mTrace("drop stable rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessAlterStreamRsp(SRpcMsg *rpcMsg) {
+//  mTrace("alter stream rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+//static void mgmtProcessConfigDnodeRsp(SRpcMsg *rpcMsg) {
+//  mTrace("config dnode rsp received, handle:%p code:%d", rpcMsg->handle, rpcMsg->code);
+//}
+//
+
+
+//
+//void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle) {
+//  mTrace("table:%s, send alter stream msg, ahandle:%p", pTable->tableId, pTable->sid, ahandle);
+//}
+//
+//void mgmtSendDropVnodeMsg(int32_t vgId, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
+//  mTrace("vnode:%d send free vnode msg, ahandle:%p", vnode, ahandle);
+//  SMDDropVnodeMsg *pDrop = rpcMallocCont(sizeof(SMDDropVnodeMsg));
+//  SRpcMsg rpcMsg = {
+//      .handle  = ahandle,
+//      .pCont   = pDrop,
+//      .contLen = pDrop ? sizeof(SMDDropVnodeMsg) : 0,
+//      .code    = 0,
+//      .msgType = TSDB_MSG_TYPE_MD_DROP_VNODE
+//  };
+//  rpcSendRequest(tsMgmtDClientRpc, ipSet, &rpcMsg);
+//}
+//
+
+////
+////int32_t mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) {
+////  char *option, *value;
+////  int32_t   olen, valen;
+////
+////  paGetToken(msg, &option, &olen);
+////  if (strncasecmp(option, "unremove", 8) == 0) {
+////    mgmtSetDnodeUnRemove(pDnode);
+////    return TSDB_CODE_SUCCESS;
+////  } else if (strncasecmp(option, "score", 5) == 0) {
+////    paGetToken(option + olen + 1, &value, &valen);
+////    if (valen > 0) {
+////      int32_t score = atoi(value);
+////      mTrace("dnode:%s, custom score set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->customScore, score);
+////      pDnode->customScore = score;
+////      mgmtUpdateDnode(pDnode);
+////      //mgmtStartBalanceTimer(15);
+////    }
+////    return TSDB_CODE_INVALID_SQL;
+////  } else if (strncasecmp(option, "bandwidth", 9) == 0) {
+////    paGetToken(msg, &value, &valen);
+////    if (valen > 0) {
+////      int32_t bandwidthMb = atoi(value);
+////      if (bandwidthMb >= 0 && bandwidthMb < 10000000) {
+////        mTrace("dnode:%s, bandwidth(Mb) set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->bandwidthMb, bandwidthMb);
+////        pDnode->bandwidthMb = bandwidthMb;
+////        mgmtUpdateDnode(pDnode);
+////        return TSDB_CODE_SUCCESS;
+////      }
+////    }
+////    return TSDB_CODE_INVALID_SQL;
+////  }
+////
+////  return -1;
+////}
+////

src/mnode/src/mgmtDServer.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "trpc.h"
+#include "tsched.h"
+#include "tstatus.h"
+#include "tsystem.h"
+#include "tutil.h"
+#include "dnode.h"
+#include "mnode.h"
+#include "mgmtBalance.h"
+#include "mgmtDb.h"
+#include "mgmtDServer.h"
+#include "mgmtGrant.h"
+#include "mgmtProfile.h"
+#include "mgmtShell.h"
+#include "mgmtTable.h"
+#include "mgmtVgroup.h"
+
+
+static void   mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg);
+static int    mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey);
+static void (*mgmtProcessDnodeMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *rpcMsg);
+static void  *tsMgmtDServerRpc;
+
+int32_t mgmtInitDServer() {
+  SRpcInit rpcInit = {0};
+  rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;;
+  rpcInit.localPort    = tsMgmtDnodePort;
+  rpcInit.label        = "MND-DS";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = mgmtProcessMsgFromDnode;
+  rpcInit.sessions     = tsMaxDnodes * 5;
+  rpcInit.connType     = TAOS_CONN_SERVER;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
+  rpcInit.afp          = mgmtDServerRetrieveAuth;
+
+  tsMgmtDServerRpc = rpcOpen(&rpcInit);
+  if (tsMgmtDServerRpc == NULL) {
+    mError("failed to init server connection to dnode");
+    return -1;
+  }
+
+  mPrint("server connection to dnode is opened");
+  return 0;
+}
+
+void mgmtCleanupDServer() {
+  if (tsMgmtDServerRpc) {
+    rpcClose(tsMgmtDServerRpc);
+    tsMgmtDServerRpc = NULL;
+    mPrint("server connection to dnode is closed");
+  }
+}
+
+void mgmtAddDServerMsgHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) {
+  mgmtProcessDnodeMsgFp[msgType] = fp;
+}
+
+static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) {
+  if (mgmtProcessDnodeMsgFp[rpcMsg->msgType]) {
+    (*mgmtProcessDnodeMsgFp[rpcMsg->msgType])(rpcMsg);
+  } else {
+    mError("%s is not processed", taosMsg[rpcMsg->msgType]);
+  }
+
+  rpcFreeCont(rpcMsg->pCont);
+}
+
+static int mgmtDServerRetrieveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey) {
+  return TSDB_CODE_SUCCESS;
+}
+
+//
+//
+//static void mgmtProcessTableCfgMsg(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle) {
+//  STableCfgMsg *pCfg = (STableCfgMsg *) pCont;
+//  pCfg->dnode = htonl(pCfg->dnode);
+//  pCfg->vnode = htonl(pCfg->vnode);
+//  pCfg->sid   = htonl(pCfg->sid);
+//  mTrace("dnode:%s, vnode:%d, sid:%d, receive table config msg", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
+//
+//  if (!sdbMaster) {
+//    mError("dnode:%s, vnode:%d, sid:%d, not master, redirect it", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
+//    mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_REDIRECT, NULL, 0);
+//    return;
+//  }
+//
+//  STableInfo *pTable = mgmtGetTableByPos(pCfg->dnode, pCfg->vnode, pCfg->sid);
+//  if (pTable == NULL) {
+//    mError("dnode:%s, vnode:%d, sid:%d, table not found", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
+//    mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_INVALID_TABLE, NULL, 0);
+//    return;
+//  }
+//
+//  mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_SUCCESS, NULL, 0);
+//
+//  //TODO
+//  SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCfg->dnode);
+//  mgmtSendCreateTableMsg(NULL, &ipSet, NULL);
+//}
+//
+//static void mgmtProcessVnodeCfgMsg(int8_t msgType, int8_t *pCont, int32_t contLen, void *pConn) {
+//  if (!sdbMaster) {
+//    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_REDIRECT, NULL, 0);
+//    return;
+//  }
+//
+//  SVpeerCfgMsg *pCfg = (SVpeerCfgMsg *) pCont;
+//  pCfg->dnode = htonl(pCfg->dnode);
+//  pCfg->vnode = htonl(pCfg->vnode);
+//
+//  SVgObj *pVgroup = mgmtGetVgroupByVnode(pCfg->dnode, pCfg->vnode);
+//  if (pVgroup == NULL) {
+//    mTrace("dnode:%s, vnode:%d, no vgroup info", taosIpStr(pCfg->dnode), pCfg->vnode);
+//    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_NOT_ACTIVE_VNODE, NULL, 0);
+//    return;
+//  }
+//
+//  mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_SUCCESS, NULL, 0);
+//
+//  SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCfg->dnode);
+//  mgmtSendCreateVnodeMsg(pVgroup, pCfg->vnode, &ipSet, NULL);
+//}
+//
+//static void mgmtProcessCreateTableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
+//  mTrace("create table rsp received, thandle:%p code:%d", thandle, code);
+//  if (thandle == NULL) return;
+//
+//  SProcessInfo *info = thandle;
+//  assert(info->type == TSDB_PROCESS_CREATE_TABLE || info->type == TSDB_PROCESS_CREATE_TABLE_GET_META);
+//  STableInfo *pTable = info->ahandle;
+//
+//  if (code != TSDB_CODE_SUCCESS) {
+//    mError("table:%s, failed to create in dnode, code:%d, set it dirty", pTable->tableId);
+//    mgmtSetTableDirty(pTable, true);
+//  } else {
+//    mTrace("table:%s, created in dnode", pTable->tableId);
+//    mgmtSetTableDirty(pTable, false);
+//  }
+//
+//  if (code != TSDB_CODE_SUCCESS) {
+//    SRpcMsg rpcMsg = {0};
+//    rpcMsg.code = code;
+//    rpcMsg.handle = info->thandle;
+//    rpcSendResponse(&rpcMsg);
+//  } else {
+//    if (info->type == TSDB_PROCESS_CREATE_TABLE_GET_META) {
+//      mTrace("table:%s, start to process get meta", pTable->tableId);
+//      mgmtProcessGetTableMeta(pTable, thandle);
+//    } else {
+//      SRpcMsg rpcMsg = {0};
+//      rpcMsg.code = code;
+//      rpcMsg.handle = info->thandle;
+//      rpcSendResponse(&rpcMsg);
+//    }
+//  }
+//
+//  free(info);
+//}
+//
+
+//static void mgmtProcessRemoveTableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
+//  mTrace("remove table rsp received, thandle:%p code:%d", thandle, code);
+//}
+//
+
+//
+//static void mgmtProcessDropVnodeRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
+//  mTrace("free vnode rsp received, thandle:%p code:%d", thandle, code);
+//}
+//
+//static void mgmtProcessDropStableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
+//  mTrace("drop stable rsp received, thandle:%p code:%d", thandle, code);
+//}
+//
+//static void mgmtProcessCreateVnodeRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
+//  mTrace("create vnode rsp received, thandle:%p code:%d", thandle, code);
+//  if (thandle == NULL) return;
+//
+//  SProcessInfo *info = thandle;
+//  assert(info->type == TSDB_PROCESS_CREATE_VGROUP || info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META);
+//  info->received++;
+//  SVgObj *pVgroup = info->ahandle;
+//
+//  bool isGetMeta = false;
+//  if (info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META) {
+//    isGetMeta = true;
+//  }
+//
+//  mTrace("vgroup:%d, received:%d numOfVnodes:%d", pVgroup->vgId, info->received, pVgroup->numOfVnodes);
+//  if (info->received == pVgroup->numOfVnodes) {
+//    mgmtProcessCreateTable(pVgroup, info->cont, info->contLen, info->thandle, isGetMeta);
+//    free(info);
+//  }
+//}
+//
+//void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
+//  mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle);
+//  for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
+//    SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip);
+//    mgmtSendCreateVnodeMsg(pVgroup, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle);
+//  }
+//}
+//
+//void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
+//  mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, vnode, ahandle);
+//  SMDCreateVnodeMsg *pVpeer = mgmtBuildCreateVnodeMsg(pVgroup, vnode);
+//  if (pVpeer != NULL) {
+//    mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_MD_CREATE_VNODE, pVpeer, sizeof(SMDCreateVnodeMsg), ahandle);
+//  }
+//}
+//
+//void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code) {
+//  if (msgType < 0 || msgType >= TSDB_MSG_TYPE_MAX) {
+//    mError("invalid msg type:%d", msgType);
+//    return;
+//  }
+//
+//  mTrace("msg:%d:%s is received from dnode, pConn:%p", msgType, taosMsg[(int8_t)msgType], pConn);
+//
+//  if (msgType == TSDB_MSG_TYPE_TABLE_CFG) {
+//    mgmtProcessTableCfgMsg(msgType, pCont, contLen, pConn);
+//  } else if (msgType == TSDB_MSG_TYPE_DM_CONFIG_VNODE) {
+//    mgmtProcessVnodeCfgMsg(msgType, pCont, contLen, pConn);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_CREATE_TABLE_RSP) {
+//    mgmtProcessCreateTableRsp(msgType, pCont, contLen, pConn, code);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_DROP_TABLE_RSP) {
+//    mgmtProcessRemoveTableRsp(msgType, pCont, contLen, pConn, code);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP) {
+//    mgmtProcessCreateVnodeRsp(msgType, pCont, contLen, pConn, code);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_DROP_VNODE_RSP) {
+//    mgmtProcessDropVnodeRsp(msgType, pCont, contLen, pConn, code);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_DROP_STABLE) {
+//    mgmtProcessDropStableRsp(msgType, pCont, contLen, pConn, code);
+//  } else if (msgType == TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP) {
+//  } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) {
+//  } else if (msgType == TSDB_MSG_TYPE_STATUS) {
+//    mgmtProcessDnodeStatus(msgType, pCont, contLen, pConn, code);
+//  }  else {
+//    mError("%s from dnode is not processed", taosMsg[(int8_t)msgType]);
+//  }
+//
+//  //rpcFreeCont(pCont);
+//}
+//
+//void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle) {
+//  mTrace("table:%s, sid:%d send alter stream msg, ahandle:%p", pTable->tableId, pTable->sid, ahandle);
+//}
+//
+//void mgmtSendDropVnodeMsg(int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
+//  mTrace("vnode:%d send free vnode msg, ahandle:%p", vnode, ahandle);
+//
+//  SMDDropVnodeMsg *pFreeVnode = rpcMallocCont(sizeof(SMDDropVnodeMsg));
+//  if (pFreeVnode != NULL) {
+//    pFreeVnode->vnode = htonl(vnode);
+//    mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_MD_DROP_VNODE, pFreeVnode, sizeof(SMDDropVnodeMsg), ahandle);
+//  }
+//}
+//
+
+//int32_t mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) {
+//  char *option, *value;
+//  int32_t   olen, valen;
+//
+//  paGetToken(msg, &option, &olen);
+//  if (strncasecmp(option, "unremove", 8) == 0) {
+//    mgmtSetDnodeUnRemove(pDnode);
+//    return TSDB_CODE_SUCCESS;
+//  } else if (strncasecmp(option, "score", 5) == 0) {
+//    paGetToken(option + olen + 1, &value, &valen);
+//    if (valen > 0) {
+//      int32_t score = atoi(value);
+//      mTrace("dnode:%s, custom score set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->customScore, score);
+//      pDnode->customScore = score;
+//      mgmtUpdateDnode(pDnode);
+//      //mgmtStartBalanceTimer(15);
+//    }
+//    return TSDB_CODE_INVALID_SQL;
+//  } else if (strncasecmp(option, "bandwidth", 9) == 0) {
+//    paGetToken(msg, &value, &valen);
+//    if (valen > 0) {
+//      int32_t bandwidthMb = atoi(value);
+//      if (bandwidthMb >= 0 && bandwidthMb < 10000000) {
+//        mTrace("dnode:%s, bandwidth(Mb) set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->bandwidthMb, bandwidthMb);
+//        pDnode->bandwidthMb = bandwidthMb;
+//        mgmtUpdateDnode(pDnode);
+//        return TSDB_CODE_SUCCESS;
+//      }
+//    }
+//    return TSDB_CODE_INVALID_SQL;
+//  }
+//
+//  return -1;
+//}
+//
+//
+//void mgmtCleanUpDnodeInt() {
+//  if (mgmtCleanUpDnodeIntFp) {
+//    mgmtCleanUpDnodeIntFp();
+//  }
+//}
+//
+//void mgmtProcessDnodeStatus(int8_t msgType, void *pCont, int32_t contLen, void *pConn, int32_t code) {
+//  SStatusMsg *pStatus = (SStatusMsg *)pCont;
+//
+//  SDnodeObj *pObj = mgmtGetDnode(htonl(pStatus->privateIp));
+//  if (pObj == NULL) {
+//    mError("dnode:%s not exist", taosIpStr(pObj->privateIp));
+//    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_DNODE_NOT_EXIST, NULL, 0);
+//    return;
+//  }
+//
+//  pObj->lastReboot       = htonl(pStatus->lastReboot);
+//  pObj->numOfTotalVnodes = htons(pStatus->numOfTotalVnodes);
+//  pObj->openVnodes       = htons(pStatus->openVnodes);
+//  pObj->numOfCores       = htons(pStatus->numOfCores);
+//  pObj->diskAvailable = pStatus->diskAvailable;
+//  pObj->alternativeRole  = pStatus->alternativeRole;
+////
+////  if (mgmtProcessDnodeStatusFp) {
+////    mgmtProcessDnodeStatusFp(pStatus, pObj, pConn);
+////    return;
+////  }
+//
+//  pObj->status = TSDB_DN_STATUS_READY;
+//
+////  // wait vnode dropped
+////  for (int32_t vnode = 0; vnode < pObj->numOfVnodes; ++vnode) {
+////    SVnodeLoad *pVload = &(pObj->vload[vnode]);
+////    if (pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) {
+////      bool existInDnode = false;
+////      for (int32_t j = 0; j < pObj->openVnodes; ++j) {
+////        if (htonl(pStatus->load[j].vnode) == vnode) {
+////          existInDnode = true;
+////          break;
+////        }
+////      }
+////
+////      if (!existInDnode) {
+////        pVload->dropStatus = TSDB_VN_DROP_STATUS_READY;
+////        pVload->status = TSDB_VN_STATUS_OFFLINE;
+////        mgmtUpdateDnode(pObj);
+////        mPrint("dnode:%s, vid:%d, drop finished", taosIpStr(pObj->privateIp), vnode);
+////        taosTmrStart(mgmtMonitorDbDrop, 10000, NULL, tsMgmtTmr);
+////      }
+////    } else if (pVload->vgId == 0) {
+////      /*
+////       * In some cases, vnode information may be reported abnormally, recover it
+////       */
+////      if (pVload->dropStatus != TSDB_VN_DROP_STATUS_READY || pVload->status != TSDB_VN_STATUS_OFFLINE) {
+////        mPrint("dnode:%s, vid:%d, vgroup:%d status:%s dropStatus:%s, set it to avail status",
+////               taosIpStr(pObj->privateIp), vnode, pVload->vgId, taosGetVnodeStatusStr(pVload->status),
+////               taosGetVnodeDropStatusStr(pVload->dropStatus));
+////        pVload->dropStatus = TSDB_VN_DROP_STATUS_READY;
+////        pVload->status = TSDB_VN_STATUS_OFFLINE;
+////        mgmtUpdateDnode(pObj);
+////      }
+////    }
+////  }
+//}

src/mnode/src/mgmtDb.c

@@ -18,32 +18,43 @@
 #include "taoserror.h"
 #include "tschemautil.h"
 #include "tstatus.h"
+#include "tutil.h"
 #include "mnode.h"
 #include "mgmtAcct.h"
 #include "mgmtBalance.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
-#include "mgmtDnodeInt.h"
+#include "mgmtMnode.h"
 #include "mgmtGrant.h"
+#include "mgmtShell.h"
 #include "mgmtTable.h"
 #include "mgmtUser.h"
 #include "mgmtVgroup.h"
 
-extern void *tsVgroupSdb;
-
-void *tsDbSdb = NULL;
-int32_t tsDbUpdateSize;
-
-void *(*mgmtDbActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionInsert(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionDelete(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionUpdate(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionEncode(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionDecode(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionReset(void *row, char *str, int32_t size, int32_t *ssize);
-void *mgmtDbActionDestroy(void *row, char *str, int32_t size, int32_t *ssize);
-
-void mgmtDbActionInit() {
+static void *tsDbSdb = NULL;
+static int32_t tsDbUpdateSize;
+
+static int32_t mgmtUpdateDb(SDbObj *pDb);
+static int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate);
+static int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists);
+static int32_t mgmtDropDb(SDbObj *pDb);
+
+static int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static void    mgmtProcessCreateDbMsg(SRpcMsg *rpcMsg);
+static void    mgmtProcessAlterDbMsg(SRpcMsg *rpcMsg);
+static void    mgmtProcessDropDbMsg(SRpcMsg *rpcMsg);
+
+static void *(*mgmtDbActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionInsert(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionDelete(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionUpdate(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionEncode(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionDecode(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionReset(void *row, char *str, int32_t size, int32_t *ssize);
+static void *mgmtDbActionDestroy(void *row, char *str, int32_t size, int32_t *ssize);
+
+static void mgmtDbActionInit() {
   mgmtDbActionFp[SDB_TYPE_INSERT] = mgmtDbActionInsert;
   mgmtDbActionFp[SDB_TYPE_DELETE] = mgmtDbActionDelete;
   mgmtDbActionFp[SDB_TYPE_UPDATE] = mgmtDbActionUpdate;
@@ -53,7 +64,7 @@ void mgmtDbActionInit() {
   mgmtDbActionFp[SDB_TYPE_DESTROY] = mgmtDbActionDestroy;
 }
 
-void *mgmtDbAction(char action, void *row, char *str, int32_t size, int32_t *ssize) {
+static void *mgmtDbAction(char action, void *row, char *str, int32_t size, int32_t *ssize) {
   if (mgmtDbActionFp[(uint8_t)action] != NULL) {
     return (*(mgmtDbActionFp[(uint8_t)action]))(row, str, size, ssize);
   }
@@ -97,6 +108,12 @@ int32_t mgmtInitDbs() {
     }
   }
 
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CREATE_DB, mgmtProcessCreateDbMsg);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_ALTER_DB, mgmtProcessAlterDbMsg);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_DROP_DB, mgmtProcessDropDbMsg);
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_DB, mgmtGetDbMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_DB, mgmtRetrieveDbs);
+
   mTrace("db data is initialized");
   return 0;
 }
@@ -116,7 +133,7 @@ SDbObj *mgmtGetDbByTableId(char *tableId) {
   return (SDbObj *)sdbGetRow(tsDbSdb, db);
 }
 
-int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) {
+static int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) {
   if (pCreate->commitLog < 0 || pCreate->commitLog > 1) {
     mError("invalid db option commitLog: %d, only 0 or 1 allowed", pCreate->commitLog);
     return TSDB_CODE_INVALID_OPTION;
@@ -189,7 +206,7 @@ int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) {
+static int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) {
   // assign default parameters
   if (pCreate->maxSessions < 0) pCreate->maxSessions = tsSessionsPerVnode;      //
   if (pCreate->cacheBlockSize < 0) pCreate->cacheBlockSize = tsCacheBlockSize;  //
@@ -234,7 +251,13 @@ int32_t mgmtCheckDbParams(SCreateDbMsg *pCreate) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) {
+static int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) {
+  int32_t numOfDbs = sdbGetNumOfRows(tsDbSdb);
+  if (numOfDbs >= tsMaxDbs) {
+    mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs);
+    return TSDB_CODE_TOO_MANY_DATABASES;
+  }
+
   int32_t code = mgmtCheckDbLimit(pAcct);
   if (code != 0) {
     return code;
@@ -270,11 +293,11 @@ int32_t mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) {
   return code;
 }
 
-int32_t mgmtUpdateDb(SDbObj *pDb) {
+static int32_t mgmtUpdateDb(SDbObj *pDb) {
   return sdbUpdateRow(tsDbSdb, pDb, tsDbUpdateSize, 1);
 }
 
-int32_t mgmtSetDbDropping(SDbObj *pDb) {
+static int32_t mgmtSetDbDropping(SDbObj *pDb) {
   if (pDb->dropStatus == TSDB_DB_STATUS_DROP_FROM_SDB) return 0;
 
   SVgObj *pVgroup = pDb->pHead;
@@ -295,7 +318,17 @@ int32_t mgmtSetDbDropping(SDbObj *pDb) {
         }
       }
     }
-//    mgmtSendRemoveVgroupMsg(pVgroup);
+
+    //void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) {
+    //  mTrace("vgroup:%d send free vgroup msg, ahandle:%p", pVgroup->vgId, ahandle);
+    //
+    //  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    //    SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip);
+    //    mgmtSendDropVnodeMsg(pVgroup->vnodeGid[i].vnode, &ipSet, ahandle);
+    //  }
+    //}
+    //
+//    mgmtSendDropVgroupMsg(pVgroup);
     pVgroup = pVgroup->next;
   }
 
@@ -311,7 +344,7 @@ int32_t mgmtSetDbDropping(SDbObj *pDb) {
   return 0;
 }
 
-bool mgmtCheckDropDbFinished(SDbObj *pDb) {
+static bool mgmtCheckDropDbFinished(SDbObj *pDb) {
   SVgObj *pVgroup = pDb->pHead;
   while (pVgroup) {
     for (int32_t i = 0; i < pVgroup->numOfVnodes; i++) {
@@ -334,7 +367,7 @@ bool mgmtCheckDropDbFinished(SDbObj *pDb) {
   return true;
 }
 
-void mgmtDropDbFromSdb(SDbObj *pDb) {
+static void mgmtDropDbFromSdb(SDbObj *pDb) {
   while (pDb->pHead) mgmtDropVgroup(pDb, pDb->pHead);
 
 //  SSuperTableObj *pMetric = pDb->pSTable;
@@ -349,13 +382,13 @@ void mgmtDropDbFromSdb(SDbObj *pDb) {
   mPrint("db:%s database drop finished", pDb->name);
 }
 
-int32_t mgmtDropDb(SDbObj *pDb) {
+static int32_t mgmtDropDb(SDbObj *pDb) {
   if (pDb->dropStatus == TSDB_DB_STATUS_DROPPING) {
     bool finished = mgmtCheckDropDbFinished(pDb);
     if (!finished) {
       SVgObj *pVgroup = pDb->pHead;
       while (pVgroup != NULL) {
-        mgmtSendRemoveVgroupMsg(pVgroup, NULL);
+        //mgmtSendDropVgroupMsg(pVgroup, NULL);
         pVgroup = pVgroup->next;
       }
       return TSDB_CODE_ACTION_IN_PROGRESS;
@@ -372,7 +405,7 @@ int32_t mgmtDropDb(SDbObj *pDb) {
   }
 }
 
-int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
+static int32_t mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
   SDbObj *pDb = (SDbObj *)sdbGetRow(tsDbSdb, name);
   if (pDb == NULL) {
     if (ignoreNotExists) return TSDB_CODE_SUCCESS;
@@ -395,7 +428,8 @@ bool mgmtCheckIsMonitorDB(char *db, char *monitordb) {
   return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb));
 }
 
-void mgmtMonitorDbDrop(void *unused, void *unusedt) {
+UNUSED_FUNC
+static void mgmtMonitorDbDrop(void *unused, void *unusedt) {
   void *  pNode = NULL;
   SDbObj *pDb = NULL;
 
@@ -408,7 +442,7 @@ void mgmtMonitorDbDrop(void *unused, void *unusedt) {
   }
 }
 
-int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) {
+static int32_t mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) {
   return 0;
 //  int32_t code = TSDB_CODE_SUCCESS;
 //
@@ -528,7 +562,7 @@ void mgmtCleanUpDbs() {
   sdbCloseTable(tsDbSdb);
 }
 
-int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
+static int32_t mgmtGetDbMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   int32_t cols = 0;
 
   SSchema *pSchema = tsGetSchema(pMeta);
@@ -677,7 +711,7 @@ char *mgmtGetDbStr(char *src) {
   return ++pos;
 }
 
-int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
   int32_t numOfRows = 0;
   SDbObj *pDb = NULL;
   char *  pWrite;
@@ -869,3 +903,94 @@ void mgmtAddTableIntoDb(SDbObj *pDb) {
 void mgmtRemoveTableFromDb(SDbObj *pDb) {
   atomic_add_fetch_32(&pDb->numOfTables, -1);
 }
+
+static void mgmtProcessCreateDbMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SCreateDbMsg *pCreate = (SCreateDbMsg *) rpcMsg->pCont;
+
+  pCreate->maxSessions     = htonl(pCreate->maxSessions);
+  pCreate->cacheBlockSize  = htonl(pCreate->cacheBlockSize);
+  pCreate->daysPerFile     = htonl(pCreate->daysPerFile);
+  pCreate->daysToKeep      = htonl(pCreate->daysToKeep);
+  pCreate->daysToKeep1     = htonl(pCreate->daysToKeep1);
+  pCreate->daysToKeep2     = htonl(pCreate->daysToKeep2);
+  pCreate->commitTime      = htonl(pCreate->commitTime);
+  pCreate->blocksPerTable  = htons(pCreate->blocksPerTable);
+  pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock);
+  // pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks);
+
+  if (mgmtCheckExpired()) {
+    rpcRsp.code = TSDB_CODE_GRANT_EXPIRED;
+  } else if (!pUser->writeAuth) {
+    rpcRsp.code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    rpcRsp.code = mgmtCreateDb(pUser->pAcct, pCreate);
+    if (rpcRsp.code == TSDB_CODE_SUCCESS) {
+      mLPrint("DB:%s is created by %s", pCreate->db, pUser->user);
+    }
+  }
+
+  rpcSendResponse(&rpcRsp);
+}
+
+static void mgmtProcessAlterDbMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SAlterDbMsg *pAlter = (SAlterDbMsg *) rpcMsg->pCont;
+  pAlter->daysPerFile = htonl(pAlter->daysPerFile);
+  pAlter->daysToKeep  = htonl(pAlter->daysToKeep);
+  pAlter->maxSessions = htonl(pAlter->maxSessions) + 1;
+
+  if (!pUser->writeAuth) {
+    rpcRsp.code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    rpcRsp.code = mgmtAlterDb(pUser->pAcct, pAlter);
+    if (rpcRsp.code == TSDB_CODE_SUCCESS) {
+      mLPrint("DB:%s is altered by %s", pAlter->db, pUser->user);
+    }
+  }
+
+  rpcSendResponse(&rpcRsp);
+}
+
+
+static void mgmtProcessDropDbMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return ;
+  }
+
+  if (pUser->superAuth) {
+    SDropDbMsg *pDrop = rpcMsg->pCont;
+    rpcRsp.code = mgmtDropDbByName(pUser->pAcct, pDrop->db, pDrop->ignoreNotExists);
+    if (rpcRsp.code == TSDB_CODE_SUCCESS) {
+      mLPrint("DB:%s is dropped by %s", pDrop->db, pUser->user);
+    }
+  } else {
+    rpcRsp.code = TSDB_CODE_NO_RIGHTS;
+  }
+
+  rpcSendResponse(&rpcRsp);
+}

src/mnode/src/mgmtDnode.c

@@ -18,9 +18,11 @@
 #include "tmodule.h"
 #include "tschemautil.h"
 #include "tstatus.h"
-#include "mnode.h"
-#include "mgmtDnode.h"
 #include "mgmtBalance.h"
+#include "mgmtDnode.h"
+#include "mgmtDClient.h"
+#include "mgmtMnode.h"
+#include "mgmtShell.h"
 #include "mgmtUser.h"
 #include "mgmtVgroup.h"
 
@@ -30,14 +32,18 @@ SDnodeObj *(*mgmtGetDnodeFp)(uint32_t ip) = NULL;
 int32_t    (*mgmtGetDnodesNumFp)() = NULL;
 int32_t    (*mgmtUpdateDnodeFp)(SDnodeObj *pDnode) = NULL;
 void *     (*mgmtGetNextDnodeFp)(SShowObj *pShow, SDnodeObj **pDnode) = NULL;
-int32_t    (*mgmtGetScoresMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn) = NULL;
-int32_t    (*mgmtRetrieveScoresFp)(SShowObj *pShow, char *data, int32_t rows, void *pConn) = NULL;
 void       (*mgmtSetDnodeUnRemoveFp)(SDnodeObj *pDnode) = NULL;
-int32_t    (*mgmtCreateDnodeFp)(uint32_t ip) = NULL;
-int32_t    (*mgmtDropDnodeByIpFp)(uint32_t ip) = NULL;
-
 
 static SDnodeObj tsDnodeObj = {0};
+static void *  mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode);
+static bool    mgmtCheckConfigShow(SGlobalConfig *cfg);
+static int32_t mgmtGetModuleMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static void    mgmtProcessCfgDnodeMsg(SRpcMsg *rpcMsg);
 
 void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode) {
   int32_t maxVnodes = pDnode->numOfCores * tsNumOfVnodesPerCore;
@@ -111,122 +117,6 @@ void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int32_t numOfVnodes) {
   }
 }
 
-int32_t mgmtGetDnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
-  int32_t cols = 0;
-
-  SUserObj *pUser = mgmtGetUserFromConn(pConn);
-  if (pUser == NULL) return 0;
-
-  if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "IP");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "open vnodes");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "free vnodes");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 18;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "balance state");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "public ip");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = mgmtGetDnodesNum();
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  pShow->pNode = NULL;
-
-  return 0;
-}
-
-int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-  int32_t   numOfRows = 0;
-  int32_t   cols      = 0;
-  SDnodeObj *pDnode   = NULL;
-  char      *pWrite;
-  char      ipstr[20];
-
-  while (numOfRows < rows) {
-    pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode);
-    if (pDnode == NULL) break;
-
-    cols = 0;
-
-    tinet_ntoa(ipstr, pDnode->privateIp);
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, ipstr);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pDnode->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pDnode->openVnodes;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pDnode->numOfFreeVnodes;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, taosGetDnodeStatusStr(pDnode->status) );
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, taosGetDnodeLbStatusStr(pDnode->lbStatus));
-    cols++;
-
-    tinet_ntoa(ipstr, pDnode->publicIp);
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, ipstr);
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
 
 bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) {
   uint32_t status = pDnode->moduleStatus & (1 << moduleType);
@@ -326,7 +216,7 @@ int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pCo
   return numOfRows;
 }
 
-int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
+static int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   int32_t cols = 0;
 
   SUserObj *pUser = mgmtGetUserFromConn(pConn);
@@ -367,7 +257,7 @@ int32_t mgmtGetConfigMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   return 0;
 }
 
-int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
   int32_t numOfRows = 0;
 
   for (int32_t i = tsGlobalConfigNum - 1; i >= 0 && numOfRows < rows; --i) {
@@ -414,7 +304,7 @@ int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pCo
   return numOfRows;
 }
 
-int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
+static int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   int32_t cols = 0;
   SUserObj *pUser = mgmtGetUserFromConn(pConn);
   if (pUser == NULL) return 0;
@@ -488,7 +378,7 @@ int32_t mgmtGetVnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   return 0;
 }
 
-int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
   int32_t        numOfRows = 0;
   SDnodeObj *pDnode = NULL;
   char *     pWrite;
@@ -538,6 +428,14 @@ int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pCon
 }
 
 int32_t mgmtInitDnodes() {
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_MODULE, mgmtGetModuleMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_MODULE, mgmtRetrieveModules);
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_CONFIGS, mgmtGetConfigMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_CONFIGS, mgmtRetrieveConfigs);
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_VNODES, mgmtGetVnodeMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_VNODES, mgmtRetrieveVnodes);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_CONFIG_DNODE, mgmtProcessCfgDnodeMsg);
+
   if (mgmtInitDnodesFp) {
     return mgmtInitDnodesFp();
   } else {
@@ -607,25 +505,6 @@ void *mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode) {
   return *pDnode;
 }
 
-int32_t mgmtGetScoresMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
-  if (mgmtGetScoresMetaFp) {
-    SUserObj *pUser = mgmtGetUserFromConn(pConn);
-    if (pUser == NULL) return 0;
-    if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-    return mgmtGetScoresMetaFp(pMeta, pShow, pConn);
-  } else {
-    return TSDB_CODE_OPS_NOT_SUPPORT;
-  }
-}
-
-int32_t mgmtRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-  if (mgmtRetrieveScoresFp) {
-    return mgmtRetrieveScoresFp(pShow, data, rows, pConn);
-  } else {
-    return 0;
-  }
-}
-
 void mgmtSetDnodeUnRemove(SDnodeObj *pDnode) {
   if (mgmtSetDnodeUnRemoveFp) {
     mgmtSetDnodeUnRemoveFp(pDnode);
@@ -640,16 +519,49 @@ bool mgmtCheckConfigShow(SGlobalConfig *cfg) {
   return true;
 }
 
-/**
- * check if a dnode in remove state
- **/
 bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode) {
   return pDnode->lbStatus == TSDB_DN_LB_STATUS_OFFLINE_REMOVING || pDnode->lbStatus == TSDB_DN_LB_STATE_SHELL_REMOVING;
 }
 
-/**
- * check if a dnode in offline state
- **/
 bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode) {
   return pDnode->status == TSDB_DN_STATUS_OFFLINE;
 }
+
+void mgmtProcessCfgDnodeMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SCMCfgDnodeMsg *pCmCfgDnode = (SCMCfgDnodeMsg *) rpcMsg->pCont;
+  uint32_t dnodeIp = inet_addr(pCmCfgDnode->ip);
+
+  if (strcmp(pUser->pAcct->user, "root") != 0) {
+    rpcRsp.code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    SRpcIpSet ipSet = mgmtGetIpSetFromIp(dnodeIp);
+    SMDCfgDnodeMsg *pMdCfgDnode = rpcMallocCont(sizeof(SMDCfgDnodeMsg));
+    strcpy(pMdCfgDnode->ip, pCmCfgDnode->ip);
+    strcpy(pMdCfgDnode->config, pCmCfgDnode->config);
+    SRpcMsg rpcMdCfgDnodeMsg = {
+        .handle = 0,
+        .code = 0,
+        .msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE,
+        .pCont = pMdCfgDnode,
+        .contLen = sizeof(SMDCfgDnodeMsg)
+    };
+    mgmtSendMsgToDnode(&ipSet, &rpcMdCfgDnodeMsg);
+    rpcRsp.code = TSDB_CODE_SUCCESS;
+  }
+
+  if (rpcRsp.code == TSDB_CODE_SUCCESS) {
+    mTrace("dnode:%s is configured by %s", pCmCfgDnode->ip, pUser->user);
+  }
+
+  rpcSendResponse(&rpcRsp);
+}

src/mnode/src/mgmtDnodeInt.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-#include "taoserror.h"
-#include "tsched.h"
-#include "tstatus.h"
-#include "tsystem.h"
-#include "tutil.h"
-#include "dnode.h"
-#include "mnode.h"
-#include "mgmtBalance.h"
-#include "mgmtDb.h"
-#include "mgmtDnode.h"
-#include "mgmtDnodeInt.h"
-#include "mgmtGrant.h"
-#include "mgmtProfile.h"
-#include "mgmtShell.h"
-#include "mgmtTable.h"
-#include "mgmtVgroup.h"
-
-int32_t (*mgmtInitDnodeIntFp)() = NULL;
-void (*mgmtCleanUpDnodeIntFp)() = NULL;
-
-void (*mgmtSendMsgToDnodeFp)(SRpcIpSet *ipSet, int8_t msgType, void *pCont, int32_t contLen, void *ahandle) = NULL;
-void (*mgmtSendRspToDnodeFp)(void *handle, int32_t code, void *pCont, int32_t contLen) = NULL;
-void *mgmtStatusTimer = NULL;
-
-static void mgmtProcessDnodeStatus(int8_t msgType, void *pCont, int32_t contLen, void *pConn, int32_t code);
-
-static void mgmtSendMsgToDnodeQueueFp(SSchedMsg *sched) {
-  int32_t contLen  = *(int32_t *) (sched->msg - 4);
-  int32_t code     = *(int32_t *) (sched->msg - 8);
-  int8_t  msgType  = *(int8_t *) (sched->msg - 9);
-  void    *ahandle = sched->ahandle;
-  int8_t  *pCont   = sched->msg;
-
-//  dnodeProcessMsgFromMgmt(msgType, pCont, contLen, ahandle, code);
-}
-
-void mgmtSendMsgToDnode(SRpcIpSet *ipSet, int8_t msgType, void *pCont, int32_t contLen, void *ahandle) {
-  mTrace("msg:%d:%s is sent to dnode, ahandle:%p", msgType, taosMsg[msgType], ahandle);
-  if (mgmtSendMsgToDnodeFp) {
-    mgmtSendMsgToDnodeFp(ipSet, msgType, pCont, contLen, ahandle);
-  } else {
-    if (pCont == NULL) {
-      pCont = rpcMallocCont(1);
-      contLen = 0;
-    }
-    SSchedMsg schedMsg = {0};
-    schedMsg.fp      = mgmtSendMsgToDnodeQueueFp;
-    schedMsg.msg     = pCont;
-    schedMsg.ahandle = ahandle;
-    *(int32_t *) (pCont - 4) = contLen;
-    *(int32_t *) (pCont - 8) = TSDB_CODE_SUCCESS;
-    *(int8_t *)  (pCont - 9) = msgType;
-    taosScheduleTask(tsDnodeMgmtQhandle, &schedMsg);
-  }
-}
-
-void mgmtSendRspToDnode(void *pConn, int8_t msgType, int32_t code, void *pCont, int32_t contLen) {
-  mTrace("rsp:%d:%s is sent to dnode", msgType, taosMsg[msgType]);
-  if (mgmtSendRspToDnodeFp) {
-    mgmtSendRspToDnodeFp(pConn, code, pCont, contLen);
-  } else {
-    if (pCont == NULL) {
-      pCont = rpcMallocCont(1);
-      contLen = 0;
-    }
-    SSchedMsg schedMsg = {0};
-    schedMsg.fp  = mgmtSendMsgToDnodeQueueFp;
-    schedMsg.msg = pCont;
-    *(int32_t *) (pCont - 4) = contLen;
-    *(int32_t *) (pCont - 8) = code;
-    *(int8_t *)  (pCont - 9) = msgType;
-    taosScheduleTask(tsDnodeMgmtQhandle, &schedMsg);
-  }
-}
-
-static void mgmtProcessTableCfgMsg(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle) {
-  STableCfgMsg *pCfg = (STableCfgMsg *) pCont;
-  pCfg->dnode = htonl(pCfg->dnode);
-  pCfg->vnode = htonl(pCfg->vnode);
-  pCfg->sid   = htonl(pCfg->sid);
-  mTrace("dnode:%s, vnode:%d, sid:%d, receive table config msg", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
-
-  if (!sdbMaster) {
-    mError("dnode:%s, vnode:%d, sid:%d, not master, redirect it", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
-    mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_REDIRECT, NULL, 0);
-    return;
-  }
-
-  STableInfo *pTable = mgmtGetTableByPos(pCfg->dnode, pCfg->vnode, pCfg->sid);
-  if (pTable == NULL) {
-    mError("dnode:%s, vnode:%d, sid:%d, table not found", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid);
-    mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_INVALID_TABLE, NULL, 0);
-    return;
-  }
-
-  mgmtSendRspToDnode(thandle, msgType + 1, TSDB_CODE_SUCCESS, NULL, 0);
-
-  //TODO
-  SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCfg->dnode);
-  mgmtSendCreateTableMsg(NULL, &ipSet, NULL);
-}
-
-static void mgmtProcessVnodeCfgMsg(int8_t msgType, int8_t *pCont, int32_t contLen, void *pConn) {
-  if (!sdbMaster) {
-    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_REDIRECT, NULL, 0);
-    return;
-  }
-
-  SVpeerCfgMsg *pCfg = (SVpeerCfgMsg *) pCont;
-  pCfg->dnode = htonl(pCfg->dnode);
-  pCfg->vnode = htonl(pCfg->vnode);
-
-  SVgObj *pVgroup = mgmtGetVgroupByVnode(pCfg->dnode, pCfg->vnode);
-  if (pVgroup == NULL) {
-    mTrace("dnode:%s, vnode:%d, no vgroup info", taosIpStr(pCfg->dnode), pCfg->vnode);
-    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_NOT_ACTIVE_VNODE, NULL, 0);
-    return;
-  }
-
-  mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_SUCCESS, NULL, 0);
-
-  SRpcIpSet ipSet = mgmtGetIpSetFromIp(pCfg->dnode);
-  mgmtSendCreateVnodeMsg(pVgroup, pCfg->vnode, &ipSet, NULL);
-}
-
-static void mgmtProcessCreateTableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
-  mTrace("create table rsp received, thandle:%p code:%d", thandle, code);
-  if (thandle == NULL) return;
-
-  SProcessInfo *info = thandle;
-  assert(info->type == TSDB_PROCESS_CREATE_TABLE || info->type == TSDB_PROCESS_CREATE_TABLE_GET_META);
-  STableInfo *pTable = info->ahandle;
-
-  if (code != TSDB_CODE_SUCCESS) {
-    mError("table:%s, failed to create in dnode, code:%d, set it dirty", pTable->tableId);
-    mgmtSetTableDirty(pTable, true);
-  } else {
-    mTrace("table:%s, created in dnode", pTable->tableId);
-    mgmtSetTableDirty(pTable, false);
-  }
-
-  if (code != TSDB_CODE_SUCCESS) {
-    SRpcMsg rpcMsg = {0};
-    rpcMsg.code = code;
-    rpcMsg.handle = info->thandle;
-    rpcSendResponse(&rpcMsg);
-  } else {
-    if (info->type == TSDB_PROCESS_CREATE_TABLE_GET_META) {
-      mTrace("table:%s, start to process get meta", pTable->tableId);
-      mgmtProcessGetTableMeta(pTable, thandle);
-    } else {
-      SRpcMsg rpcMsg = {0};
-      rpcMsg.code = code;
-      rpcMsg.handle = info->thandle;
-      rpcSendResponse(&rpcMsg);
-    }
-  }
-
-  free(info);
-}
-
-void mgmtSendCreateTableMsg(SDCreateTableMsg *pCreate, SRpcIpSet *ipSet, void *ahandle) {
-  mTrace("table:%s, send create table msg, ahandle:%p", pCreate->tableId, ahandle);
-  mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_DNODE_CREATE_TABLE, pCreate, htonl(pCreate->contLen), ahandle);
-}
-
-static void mgmtProcessRemoveTableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
-  mTrace("remove table rsp received, thandle:%p code:%d", thandle, code);
-}
-
-void mgmtSendRemoveTableMsg(SDRemoveTableMsg *pRemove, SRpcIpSet *ipSet, void *ahandle) {
-  mTrace("table:%s, sid:%d send remove table msg, ahandle:%p", pRemove->tableId, htonl(pRemove->sid), ahandle);
-  if (pRemove != NULL) {
-    mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_DNODE_REMOVE_TABLE, pRemove, sizeof(SDRemoveTableMsg), ahandle);
-  }
-}
-
-static void mgmtProcessFreeVnodeRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
-  mTrace("free vnode rsp received, thandle:%p code:%d", thandle, code);
-}
-
-static void mgmtProcessDropStableRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
-  mTrace("drop stable rsp received, thandle:%p code:%d", thandle, code);
-}
-
-static void mgmtProcessCreateVnodeRsp(int8_t msgType, int8_t *pCont, int32_t contLen, void *thandle, int32_t code) {
-  mTrace("create vnode rsp received, thandle:%p code:%d", thandle, code);
-  if (thandle == NULL) return;
-
-  SProcessInfo *info = thandle;
-  assert(info->type == TSDB_PROCESS_CREATE_VGROUP || info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META);
-  info->received++;
-  SVgObj *pVgroup = info->ahandle;
-
-  bool isGetMeta = false;
-  if (info->type == TSDB_PROCESS_CREATE_VGROUP_GET_META) {
-    isGetMeta = true;
-  }
-
-  mTrace("vgroup:%d, received:%d numOfVnodes:%d", pVgroup->vgId, info->received, pVgroup->numOfVnodes);
-  if (info->received == pVgroup->numOfVnodes) {
-    mgmtProcessCreateTable(pVgroup, info->cont, info->contLen, info->thandle, isGetMeta);
-    free(info);
-  }
-}
-
-void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
-  mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle);
-  for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
-    SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip);
-    mgmtSendCreateVnodeMsg(pVgroup, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle);
-  }
-}
-
-void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
-  mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, vnode, ahandle);
-  SCreateVnodeMsg *pVpeer = mgmtBuildVpeersMsg(pVgroup, vnode);
-  if (pVpeer != NULL) {
-    mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_CREATE_VNODE, pVpeer, sizeof(SCreateVnodeMsg), ahandle);
-  }
-}
-
-static void mgmtProcessDnodeGrantMsg(void *pCont, void *thandle) {
-  if (mgmtUpdateGrantInfoFp) {
-    mgmtUpdateGrantInfoFp(pCont);
-    mTrace("grant info is updated");
-  }
-
-  SRpcMsg rpcMsg = {0};
-  rpcMsg.code = TSDB_CODE_SUCCESS;
-  rpcMsg.handle = thandle;
-  rpcSendResponse(&rpcMsg);
-}
-
-void mgmtProcessMsgFromDnode(char msgType, void *pCont, int32_t contLen, void *pConn, int32_t code) {
-  if (msgType < 0 || msgType >= TSDB_MSG_TYPE_MAX) {
-    mError("invalid msg type:%d", msgType);
-    return;
-  }
-
-  mTrace("msg:%d:%s is received from dnode, pConn:%p", msgType, taosMsg[(int8_t)msgType], pConn);
-
-  if (msgType == TSDB_MSG_TYPE_TABLE_CFG) {
-    mgmtProcessTableCfgMsg(msgType, pCont, contLen, pConn);
-  } else if (msgType == TSDB_MSG_TYPE_CONFIG_VNODE) {
-    mgmtProcessVnodeCfgMsg(msgType, pCont, contLen, pConn);
-  } else if (msgType == TSDB_MSG_TYPE_DNODE_CREATE_TABLE_RSP) {
-    mgmtProcessCreateTableRsp(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_DNODE_REMOVE_TABLE_RSP) {
-    mgmtProcessRemoveTableRsp(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_CREATE_VNODE_RSP) {
-    mgmtProcessCreateVnodeRsp(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_DROP_VNODE_RSP) {
-    mgmtProcessFreeVnodeRsp(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_DROP_STABLE) {
-    mgmtProcessDropStableRsp(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_DNODE_CFG_RSP) {
-  } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) {
-  } else if (msgType == TSDB_MSG_TYPE_STATUS) {
-    mgmtProcessDnodeStatus(msgType, pCont, contLen, pConn, code);
-  } else if (msgType == TSDB_MSG_TYPE_GRANT) {
-    mgmtProcessDnodeGrantMsg(pCont, pConn);
-  } else {
-    mError("%s from dnode is not processed", taosMsg[(int8_t)msgType]);
-  }
-
-  //rpcFreeCont(pCont);
-}
-
-void mgmtSendAlterStreamMsg(STableInfo *pTable, SRpcIpSet *ipSet, void *ahandle) {
-  mTrace("table:%s, sid:%d send alter stream msg, ahandle:%p", pTable->tableId, pTable->sid, ahandle);
-}
-
-void mgmtSendOneFreeVnodeMsg(int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
-  mTrace("vnode:%d send free vnode msg, ahandle:%p", vnode, ahandle);
-
-  SFreeVnodeMsg *pFreeVnode = rpcMallocCont(sizeof(SFreeVnodeMsg));
-  if (pFreeVnode != NULL) {
-    pFreeVnode->vnode = htonl(vnode);
-    mgmtSendMsgToDnode(ipSet, TSDB_MSG_TYPE_DROP_VNODE, pFreeVnode, sizeof(SFreeVnodeMsg), ahandle);
-  }
-}
-
-void mgmtSendRemoveVgroupMsg(SVgObj *pVgroup, void *ahandle) {
-  mTrace("vgroup:%d send free vgroup msg, ahandle:%p", pVgroup->vgId, ahandle);
-
-  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
-    SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip);
-    mgmtSendOneFreeVnodeMsg(pVgroup->vnodeGid[i].vnode, &ipSet, ahandle);
-  }
-}
-
-int32_t mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) {
-  char *option, *value;
-  int32_t   olen, valen;
-
-  paGetToken(msg, &option, &olen);
-  if (strncasecmp(option, "unremove", 8) == 0) {
-    mgmtSetDnodeUnRemove(pDnode);
-    return TSDB_CODE_SUCCESS;
-  } else if (strncasecmp(option, "score", 5) == 0) {
-    paGetToken(option + olen + 1, &value, &valen);
-    if (valen > 0) {
-      int32_t score = atoi(value);
-      mTrace("dnode:%s, custom score set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->customScore, score);
-      pDnode->customScore = score;
-      mgmtUpdateDnode(pDnode);
-      //mgmtStartBalanceTimer(15);
-    }
-    return TSDB_CODE_INVALID_SQL;
-  } else if (strncasecmp(option, "bandwidth", 9) == 0) {
-    paGetToken(msg, &value, &valen);
-    if (valen > 0) {
-      int32_t bandwidthMb = atoi(value);
-      if (bandwidthMb >= 0 && bandwidthMb < 10000000) {
-        mTrace("dnode:%s, bandwidth(Mb) set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->bandwidthMb, bandwidthMb);
-        pDnode->bandwidthMb = bandwidthMb;
-        mgmtUpdateDnode(pDnode);
-        return TSDB_CODE_SUCCESS;
-      }
-    }
-    return TSDB_CODE_INVALID_SQL;
-  }
-
-  return -1;
-}
-
-int32_t mgmtSendCfgDnodeMsg(char *cont) {
-//#ifdef CLUSTER
-//  char *     pMsg, *pStart;
-//  int32_t        msgLen = 0;
-//#endif
-//
-//  SDnodeObj *pDnode;
-//  SCfgDnodeMsg *  pCfg = (SCfgDnodeMsg *)cont;
-//  uint32_t   ip;
-//
-//  ip = inet_addr(pCfg->ip);
-//  pDnode = mgmtGetDnode(ip);
-//  if (pDnode == NULL) {
-//    mError("dnode ip:%s not configured", pCfg->ip);
-//    return TSDB_CODE_NOT_CONFIGURED;
-//  }
-//
-//  mTrace("dnode:%s, dynamic option received, content:%s", taosIpStr(pDnode->privateIp), pCfg->config);
-//  int32_t code = mgmtCfgDynamicOptions(pDnode, pCfg->config);
-//  if (code != -1) {
-//    return code;
-//  }
-//
-//#ifdef CLUSTER
-//  pStart = taosBuildReqMsg(pDnode->thandle, TSDB_MSG_TYPE_DNODE_CFG);
-//  if (pStart == NULL) return TSDB_CODE_NODE_OFFLINE;
-//  pMsg = pStart;
-//
-//  memcpy(pMsg, cont, sizeof(SCfgDnodeMsg));
-//  pMsg += sizeof(SCfgDnodeMsg);
-//
-//  msgLen = pMsg - pStart;
-//  mgmtSendMsgToDnode(pDnode, pStart, msgLen);
-//#else
-//  (void)tsCfgDynamicOptions(pCfg->config);
-//#endif
-  return 0;
-}
-
-int32_t mgmtInitDnodeInt() {
- if (mgmtInitDnodeIntFp) {
-   return mgmtInitDnodeIntFp();
- } else {
-   return 0;
- }
-}
-
-void mgmtCleanUpDnodeInt() {
-  if (mgmtCleanUpDnodeIntFp) {
-    mgmtCleanUpDnodeIntFp();
-  }
-}
-
-void mgmtProcessDnodeStatus(int8_t msgType, void *pCont, int32_t contLen, void *pConn, int32_t code) {
-  SStatusMsg *pStatus = (SStatusMsg *)pCont;
-
-  SDnodeObj *pObj = mgmtGetDnode(htonl(pStatus->privateIp));
-  if (pObj == NULL) {
-    mError("dnode:%s not exist", taosIpStr(pObj->privateIp));
-    mgmtSendRspToDnode(pConn, msgType + 1, TSDB_CODE_DNODE_NOT_EXIST, NULL, 0);
-    return;
-  }
-
-  pObj->lastReboot       = htonl(pStatus->lastReboot);
-  pObj->numOfTotalVnodes = htons(pStatus->numOfTotalVnodes);
-  pObj->openVnodes       = htons(pStatus->openVnodes);
-  pObj->numOfCores       = htons(pStatus->numOfCores);
-  pObj->diskAvailable = pStatus->diskAvailable;
-  pObj->alternativeRole  = pStatus->alternativeRole;
-//
-//  if (mgmtProcessDnodeStatusFp) {
-//    mgmtProcessDnodeStatusFp(pStatus, pObj, pConn);
-//    return;
-//  }
-
-  pObj->status = TSDB_DN_STATUS_READY;
-
-//  // wait vnode dropped
-//  for (int32_t vnode = 0; vnode < pObj->numOfVnodes; ++vnode) {
-//    SVnodeLoad *pVload = &(pObj->vload[vnode]);
-//    if (pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) {
-//      bool existInDnode = false;
-//      for (int32_t j = 0; j < pObj->openVnodes; ++j) {
-//        if (htonl(pStatus->load[j].vnode) == vnode) {
-//          existInDnode = true;
-//          break;
-//        }
-//      }
-//
-//      if (!existInDnode) {
-//        pVload->dropStatus = TSDB_VN_DROP_STATUS_READY;
-//        pVload->status = TSDB_VN_STATUS_OFFLINE;
-//        mgmtUpdateDnode(pObj);
-//        mPrint("dnode:%s, vid:%d, drop finished", taosIpStr(pObj->privateIp), vnode);
-//        taosTmrStart(mgmtMonitorDbDrop, 10000, NULL, tsMgmtTmr);
-//      }
-//    } else if (pVload->vgId == 0) {
-//      /*
-//       * In some cases, vnode information may be reported abnormally, recover it
-//       */
-//      if (pVload->dropStatus != TSDB_VN_DROP_STATUS_READY || pVload->status != TSDB_VN_STATUS_OFFLINE) {
-//        mPrint("dnode:%s, vid:%d, vgroup:%d status:%s dropStatus:%s, set it to avail status",
-//               taosIpStr(pObj->privateIp), vnode, pVload->vgId, taosGetVnodeStatusStr(pVload->status),
-//               taosGetVnodeDropStatusStr(pVload->dropStatus));
-//        pVload->dropStatus = TSDB_VN_DROP_STATUS_READY;
-//        pVload->status = TSDB_VN_STATUS_OFFLINE;
-//        mgmtUpdateDnode(pObj);
-//      }
-//    }
-//  }
-}

src/mnode/src/mgmtGrant.c

@@ -15,21 +15,14 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "mnode.h"
 #include "mgmtAcct.h"
-#include "mgmtGrant.h"
-#include "mgmtUser.h"
 
 int32_t (*mgmtCheckUserGrantFp)() = NULL;
 int32_t (*mgmtCheckDbGrantFp)() = NULL;
-int32_t (*mgmtCheckDnodeGrantFp)() = NULL;
 void    (*mgmtAddTimeSeriesFp)(uint32_t timeSeriesNum) = NULL;
 void    (*mgmtRestoreTimeSeriesFp)(uint32_t timeSeriesNum) = NULL;
 int32_t (*mgmtCheckTimeSeriesFp)(uint32_t timeseries) = NULL;
 bool    (*mgmtCheckExpiredFp)() = NULL;
-int32_t (*mgmtGetGrantsMetaFp)(STableMeta *pMeta, SShowObj *pShow, void *pConn) = NULL;
-int32_t (*mgmtRetrieveGrantsFp)(SShowObj *pShow, char *data, int rows, void *pConn) = NULL;
-void    (*mgmtUpdateGrantInfoFp)(void *pCont) = NULL;
 
 int32_t mgmtCheckUserGrant() {
   if (mgmtCheckUserGrantFp) {
@@ -47,14 +40,6 @@ int32_t mgmtCheckDbGrant() {
   }
 }
 
-int32_t mgmtCheckDnodeGrant() {
-  if (mgmtCheckDnodeGrantFp) {
-    return (*mgmtCheckDnodeGrantFp)();
-  } else {
-    return 0;
-  }
-}
-
 void mgmtAddTimeSeries(SAcctObj *pAcct, uint32_t timeSeriesNum) {
   pAcct->acctInfo.numOfTimeSeries += timeSeriesNum;
   if (mgmtAddTimeSeriesFp) {
@@ -84,22 +69,3 @@ bool mgmtCheckExpired() {
     return false;
   }
 }
-
-int32_t mgmtGetGrantsMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
-  if (mgmtGetGrantsMetaFp) {
-    SUserObj *pUser = mgmtGetUserFromConn(pConn);
-    if (pUser == NULL) return 0;
-    if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-    return mgmtGetGrantsMetaFp(pMeta, pShow, pConn);
-  } else {
-    return TSDB_CODE_OPS_NOT_SUPPORT;
-  }
-}
-
-int32_t mgmtRetrieveGrants(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-  if (mgmtRetrieveGrantsFp) {
-    return mgmtRetrieveGrantsFp(pShow, data, rows, pConn);
-  } else {
-    return 0;
-  }
-}

src/mnode/src/mgmtMnode.c

@@ -14,145 +14,9 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "tschemautil.h"
+#include "os.h"
 #include "mgmtMnode.h"
-#include "mgmtUser.h"
 
-int32_t (*mgmtAddMnodeFp)(uint32_t privateIp, uint32_t publicIp) = NULL;
-int32_t (*mgmtRemoveMnodeFp)(uint32_t privateIp) = NULL;
-int32_t (*mgmtGetMnodesNumFp)() = NULL;
-void *  (*mgmtGetNextMnodeFp)(SShowObj *pShow, SSdbPeer **pMnode) = NULL;
-
-int32_t mgmtAddMnode(uint32_t privateIp, uint32_t publicIp) {
-  if (mgmtAddMnodeFp) {
-    return (*mgmtAddMnodeFp)(privateIp, publicIp);
-  } else {
-    return 0;
-  }
-}
-
-int32_t mgmtRemoveMnode(uint32_t privateIp) {
-  if (mgmtRemoveMnodeFp) {
-    return (*mgmtRemoveMnodeFp)(privateIp);
-  } else {
-    return 0;
-  }
-}
-
-static int32_t mgmtGetMnodesNum() {
-  if (mgmtGetMnodesNumFp) {
-    return (*mgmtGetMnodesNumFp)();
-  } else {
-    return 1;
-  }
-}
-
-static void *mgmtGetNextMnode(SShowObj *pShow, SSdbPeer **pMnode) {
-  if (mgmtGetNextMnodeFp) {
-    return (*mgmtGetNextMnodeFp)(pShow, pMnode);
-  } else {
-    if (*pMnode == NULL) {
-      *pMnode = NULL;
-    } else {
-      *pMnode = NULL;
-    }
-  }
-
-  return *pMnode;
-}
-
-int32_t mgmtGetMnodeMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
-  int32_t cols = 0;
-
-  SUserObj *pUser = mgmtGetUserFromConn(pConn);
-  if (pUser == NULL) return 0;
-
-  if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "IP");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "role");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "public ip");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int32_t i = 1; i < cols; ++i) {
-    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-  }
-
-  pShow->numOfRows = mgmtGetMnodesNum();
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  pShow->pNode = NULL;
-
-  return 0;
-}
-
-int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-  int32_t  numOfRows = 0;
-  int32_t  cols      = 0;
-  SSdbPeer *pMnode   = NULL;
-  char     *pWrite;
-  char     ipstr[20];
-
-  while (numOfRows < rows) {
-    pShow->pNode = mgmtGetNextMnode(pShow, (SSdbPeer **)&pMnode);
-    if (pMnode == NULL) break;
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pMnode->ipstr);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pMnode->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, sdbStatusStr[(uint8_t)pMnode->status]);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, sdbRoleStr[(uint8_t)pMnode->role]);
-    cols++;
-
-    tinet_ntoa(ipstr, pMnode->publicIp);
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, ipstr);
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
+bool mgmtCheckRedirect(void *handle) {
+  return true;
+}
\ No newline at end of file

src/mnode/src/mgmtNormalTable.c

@@ -24,7 +24,7 @@
 #include "mnode.h"
 #include "mgmtAcct.h"
 #include "mgmtDb.h"
-#include "mgmtDnodeInt.h"
+#include "mgmtDClient.h"
 #include "mgmtGrant.h"
 #include "mgmtNormalTable.h"
 #include "mgmtSuperTable.h"
@@ -289,9 +289,9 @@ void mgmtCleanUpNormalTables() {
 
 static void *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, SVgObj *pVgroup) {
   int32_t totalCols = pTable->numOfColumns;
-  int32_t contLen   = sizeof(SDCreateTableMsg) + totalCols * sizeof(SSchema) + pTable->sqlLen;
+  int32_t contLen   = sizeof(SDMCreateTableMsg) + totalCols * sizeof(SSchema) + pTable->sqlLen;
 
-  SDCreateTableMsg *pCreateTable = rpcMallocCont(contLen);
+  SDMCreateTableMsg *pCreateTable = rpcMallocCont(contLen);
   if (pCreateTable == NULL) {
     return NULL;
   }
@@ -323,13 +323,13 @@ static void *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, SVgObj *pVgr
     pSchema++;
   }
 
-  memcpy(pCreateTable + sizeof(SDCreateTableMsg) + totalCols * sizeof(SSchema), pTable->sql, pTable->sqlLen);
+  memcpy(pCreateTable + sizeof(SDMCreateTableMsg) + totalCols * sizeof(SSchema), pTable->sql, pTable->sqlLen);
 
   return pCreateTable;
 }
 
 int32_t mgmtCreateNormalTable(SCreateTableMsg *pCreate, int32_t contLen, SVgObj *pVgroup, int32_t sid,
-                              SDCreateTableMsg **pDCreateOut, STableInfo **pTableOut) {
+                              SDMCreateTableMsg **pDCreateOut, STableInfo **pTableOut) {
   int32_t numOfTables = sdbGetNumOfRows(tsNormalTableSdb);
   if (numOfTables >= TSDB_MAX_NORMAL_TABLES) {
     mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->tableId, numOfTables, TSDB_MAX_NORMAL_TABLES);
@@ -406,7 +406,7 @@ int32_t mgmtDropNormalTable(SDbObj *pDb, SNormalTableObj *pTable) {
     return TSDB_CODE_OTHERS;
   }
 
-  SDRemoveTableMsg *pRemove = rpcMallocCont(sizeof(SDRemoveTableMsg));
+  SMDDropTableMsg *pRemove = rpcMallocCont(sizeof(SMDDropTableMsg));
   if (pRemove == NULL) {
     mError("table:%s, failed to drop normal table, no enough memory", pTable->tableId);
     return TSDB_CODE_SERV_OUT_OF_MEMORY;
@@ -423,7 +423,15 @@ int32_t mgmtDropNormalTable(SDbObj *pDb, SNormalTableObj *pTable) {
   }
 
   SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup);
-  mgmtSendRemoveTableMsg(pRemove, &ipSet, NULL);
+  mTrace("table:%s, send drop table msg", pRemove->tableId);
+  SRpcMsg rpcMsg = {
+      .handle  = 0,
+      .pCont   = pRemove,
+      .contLen = sizeof(SMDDropTableMsg),
+      .code    = 0,
+      .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE
+  };
+  mgmtSendMsgToDnode(&ipSet, &rpcMsg);
 
   if (sdbDeleteRow(tsNormalTableSdb, pTable) < 0) {
     mError("table:%s, update ntables sdb error", pTable->tableId);

src/mnode/src/mgmtProfile.c

@@ -17,7 +17,16 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
+#include "mgmtMnode.h"
 #include "mgmtProfile.h"
+#include "mgmtShell.h"
+#include "mgmtUser.h"
+
+int32_t mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg);
+
+int32_t mgmtKillQuery(char *qidstr, void *pConn);
+int32_t mgmtKillStream(char *qidstr, void *pConn);
+int32_t mgmtKillConnection(char *qidstr, void *pConn);
 
 typedef struct {
   char     user[TSDB_TABLE_ID_LEN + 1];
@@ -663,3 +672,92 @@ int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn
   pShow->numOfReads += numOfRows;
   return numOfRows;
 }
+
+void mgmtProcessKillQueryMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SKillQueryMsg *pKill = (SKillQueryMsg *) rpcMsg->pCont;
+  int32_t code;
+
+  if (!pUser->writeAuth) {
+    code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    code = mgmtKillQuery(pKill->queryId, rpcMsg->handle);
+  }
+
+  rpcRsp.code = code;
+  rpcSendResponse(&rpcRsp);
+}
+
+void mgmtProcessKillStreamMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SKillStreamMsg *pKill = (SKillStreamMsg *) rpcMsg->pCont;
+  int32_t code;
+
+  if (!pUser->writeAuth) {
+    code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    code = mgmtKillStream(pKill->queryId, rpcMsg->handle);
+  }
+
+  rpcRsp.code = code;
+  rpcSendResponse(&rpcRsp);
+}
+
+void mgmtProcessKillConnectionMsg(SRpcMsg *rpcMsg) {
+  SRpcMsg rpcRsp = {.handle = rpcMsg->handle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0};
+  if (mgmtCheckRedirect(rpcMsg->handle)) return;
+
+  SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle);
+  if (pUser == NULL) {
+    rpcRsp.code = TSDB_CODE_INVALID_USER;
+    rpcSendResponse(&rpcRsp);
+    return;
+  }
+
+  SKillConnectionMsg *pKill = (SKillConnectionMsg *) rpcMsg->pCont;
+  int32_t code;
+
+  if (!pUser->writeAuth) {
+    code = TSDB_CODE_NO_RIGHTS;
+  } else {
+    code = mgmtKillConnection(pKill->queryId, rpcMsg->handle);
+  }
+
+  rpcRsp.code = code;
+  rpcSendResponse(&rpcRsp);
+}
+
+int32_t mgmtInitProfile() {
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_QUERIES, mgmtGetQueryMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_QUERIES, mgmtRetrieveQueries);
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_CONNS, mgmtGetConnsMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_CONNS, mgmtRetrieveConns);
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_STREAMS, mgmtGetStreamMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_STREAMS, mgmtRetrieveStreams);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_QUERY, mgmtProcessKillQueryMsg);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_STREAM, mgmtProcessKillStreamMsg);
+  mgmtAddShellMsgHandle(TSDB_MSG_TYPE_KILL_CONNECTION, mgmtProcessKillConnectionMsg);
+
+  return 0;
+}
+
+void mgmtCleanUpProfile() {
+}

src/mnode/src/mgmtSuperTable.c

@@ -28,8 +28,8 @@
 #include "mgmtChildTable.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
-#include "mgmtDnodeInt.h"
 #include "mgmtGrant.h"
+#include "mgmtShell.h"
 #include "mgmtSuperTable.h"
 #include "mgmtTable.h"
 #include "mgmtUser.h"
@@ -46,6 +46,8 @@ static void *mgmtSuperTableActionEncode(void *row, char *str, int32_t size, int3
 static void *mgmtSuperTableActionDecode(void *row, char *str, int32_t size, int32_t *ssize);
 static void *mgmtSuperTableActionReset(void *row, char *str, int32_t size, int32_t *ssize);
 static void *mgmtSuperTableActionDestroy(void *row, char *str, int32_t size, int32_t *ssize);
+static int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
 
 static void mgmtDestroySuperTable(SSuperTableObj *pTable) {
   free(pTable->schema);
@@ -187,6 +189,9 @@ int32_t mgmtInitSuperTables() {
     mgmtAddSuperTableIntoDb(pDb);
   }
 
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_METRIC, mgmtGetShowSuperTableMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_METRIC, mgmtRetrieveShowSuperTables);
+
   mTrace("stables is initialized");
   return 0;
 }
@@ -478,7 +483,7 @@ int32_t mgmtDropSuperTableColumnByName(SSuperTableObj *pStable, char *colName) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
+static int32_t mgmtGetShowSuperTableMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn) {
   SDbObj *pDb = mgmtGetDb(pShow->db);
   if (pDb == NULL) {
     return TSDB_CODE_DB_NOT_SELECTED;

src/mnode/src/mgmtSystem.c

@@ -22,8 +22,9 @@
 #include "mgmtAcct.h"
 #include "mgmtBalance.h"
 #include "mgmtDb.h"
+#include "mgmtDClient.h"
 #include "mgmtDnode.h"
-#include "mgmtDnodeInt.h"
+#include "mgmtDServer.h"
 #include "mgmtVgroup.h"
 #include "mgmtUser.h"
 #include "mgmtSystem.h"
@@ -40,9 +41,10 @@ void mgmtCleanUpSystem() {
 
   sdbCleanUpPeers();
   mgmtCleanupBalance();
-  mgmtCleanUpDnodeInt();
+  mgmtCleanupDClient();
+  mgmtCleanupDServer();
   mgmtCleanUpShell();
-  mgmtCleanUpMeters();
+  mgmtCleanUpTables();
   mgmtCleanUpVgroups();
   mgmtCleanUpDbs();
   mgmtCleanUpDnodes();
@@ -115,15 +117,18 @@ int32_t mgmtStartSystem() {
     return -1;
   }
 
-  if (mgmtInitDnodeInt() < 0) {
-    mError("failed to init inter-mgmt communication");
+  if (mgmtInitDClient() < 0) {
     return -1;
   }
 
-//  if (mgmtInitShell() < 0) {
-//    mError("failed to init shell");
-//    return -1;
-//  }
+  if (mgmtInitDServer() < 0) {
+    return -1;
+  }
+
+  if (mgmtInitShell() < 0) {
+    mError("failed to init shell");
+    return -1;
+  }
 
   if (sdbInitPeers(tsMgmtDirectory) < 0) {
     mError("failed to init peers");

src/mnode/src/mgmtVgroup.c

@@ -22,8 +22,9 @@
 #include "mnode.h"
 #include "mgmtBalance.h"
 #include "mgmtDb.h"
+#include "mgmtDClient.h"
 #include "mgmtDnode.h"
-#include "mgmtDnodeInt.h"
+#include "mgmtShell.h"
 #include "mgmtTable.h"
 #include "mgmtVgroup.h"
 
@@ -39,6 +40,9 @@ static void *mgmtVgroupActionDecode(void *row, char *str, int32_t size, int32_t
 static void *mgmtVgroupActionReset(void *row, char *str, int32_t size, int32_t *ssize);
 static void *mgmtVgroupActionDestroy(void *row, char *str, int32_t size, int32_t *ssize);
 
+static int32_t mgmtGetVgroupMeta(STableMeta *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+
 static void mgmtVgroupActionInit() {
   SVgObj tObj;
   tsVgUpdateSize = tObj.updateEnd - (int8_t *)&tObj;
@@ -108,6 +112,9 @@ int32_t mgmtInitVgroups() {
     mgmtSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes, pVgroup->vgId);
   }
 
+  mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_VGROUP, mgmtGetVgroupMeta);
+  mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_VGROUP, mgmtRetrieveVgroups);
+
   mTrace("vgroup is initialized");
   return 0;
 }
@@ -193,7 +200,7 @@ int32_t mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup) {
 
   mTrace("vgroup:%d, db:%s replica:%d is deleted", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes);
 
-  mgmtSendRemoveVgroupMsg(pVgroup, NULL);
+  //mgmtSendDropVgroupMsg(pVgroup, NULL);
 
   sdbDeleteRow(tsVgroupSdb, pVgroup);
 
@@ -503,11 +510,11 @@ void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, STableInfo *pTable) {
   taosFreeId(pVgroup->idPool, pTable->sid);
 }
 
-SCreateVnodeMsg *mgmtBuildVpeersMsg(SVgObj *pVgroup, int32_t vnode) {
+SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode) {
   SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
   if (pDb == NULL) return NULL;
 
-  SCreateVnodeMsg *pVPeers = rpcMallocCont(sizeof(SCreateVnodeMsg));
+  SMDCreateVnodeMsg *pVPeers = rpcMallocCont(sizeof(SMDCreateVnodeMsg));
   if (pVPeers == NULL) return NULL;
 
   pVPeers->vnode = htonl(vnode);
@@ -561,4 +568,25 @@ SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup) {
 SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip) {
   SRpcIpSet ipSet = {.ip[0] = ip, .numOfIps = 1, .inUse = 0, .port = tsMgmtDnodePort + 1};
   return ipSet;
+}
+
+void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, int32_t vnode, SRpcIpSet *ipSet, void *ahandle) {
+  mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, vnode, ahandle);
+  SMDCreateVnodeMsg *pCreate = mgmtBuildCreateVnodeMsg(pVgroup, vnode);
+  SRpcMsg rpcMsg = {
+      .handle  = ahandle,
+      .pCont   = pCreate,
+      .contLen = pCreate ? sizeof(SMDCreateVnodeMsg) : 0,
+      .code    = 0,
+      .msgType = TSDB_MSG_TYPE_MD_CREATE_VNODE
+  };
+  mgmtSendMsgToDnode(ipSet, &rpcMsg);
+}
+
+void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
+  mTrace("vgroup:%d, send create all vnodes msg, handle:%p", pVgroup->vgId, ahandle);
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].ip);
+    mgmtSendCreateVnodeMsg(pVgroup, pVgroup->vnodeGid[i].vnode, &ipSet, ahandle);
+  }
 }
\ No newline at end of file