diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index 2fa7762c4455f091451e16686e5d75d5c7ffabd6..fbf1ceea71bb55733ddeffc5329d0dfc8cbb93d8 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -71,13 +71,13 @@ void dnodeMgmt(SRpcMsg *pMsg) {
   rpcFreeCont(pMsg->pCont);
 }
 
-static int32_t dnodeGetVnodeList(int32_t vnodeList[]) {
+static int32_t dnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes) {
   DIR *dir = opendir(tsVnodeDir);
   if (dir == NULL) {
     return TSDB_CODE_NO_WRITE_ACCESS;
   }
 
-  int32_t numOfVnodes = 0;
+  *numOfVnodes = 0;
   struct dirent *de = NULL;
   while ((de = readdir(dir)) != NULL) {
     if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
@@ -86,21 +86,28 @@ static int32_t dnodeGetVnodeList(int32_t vnodeList[]) {
       int32_t vnode = atoi(de->d_name + 5);
       if (vnode == 0) continue;
 
-      vnodeList[numOfVnodes] = vnode;
-      numOfVnodes++;
+      vnodeList[*numOfVnodes] = vnode;
+      (*numOfVnodes)++;
     }
   }
   closedir(dir);
 
-  return numOfVnodes;
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t dnodeOpenVnodes() {
   char vnodeDir[TSDB_FILENAME_LEN * 3];
   int32_t failed = 0;
-
   int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * TSDB_MAX_VNODES);
-  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
+  int32_t numOfVnodes;
+  int32_t status;
+
+  status = dnodeGetVnodeList(vnodeList, &numOfVnodes);
+
+  if (status != TSDB_CODE_SUCCESS) {
+    dPrint("Get dnode list failed");
+    return status;
+  }
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
     snprintf(vnodeDir, TSDB_FILENAME_LEN * 3, "%s/vnode%d", tsVnodeDir, vnodeList[i]);
@@ -115,7 +122,15 @@ static int32_t dnodeOpenVnodes() {
 
 static void dnodeCloseVnodes() {
   int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * TSDB_MAX_VNODES);
-  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
+  int32_t numOfVnodes;
+  int32_t status;
+
+  status = dnodeGetVnodeList(vnodeList, &numOfVnodes);
+
+  if (status != TSDB_CODE_SUCCESS) {
+    dPrint("Get dnode list failed");
+    return;
+  }
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
     vnodeClose(vnodeList[i]);
@@ -143,7 +158,7 @@ static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
   for (int32_t j = 0; j < pCreate->cfg.replications; ++j) {
     pCreate->nodes[j].nodeId = htonl(pCreate->nodes[j].nodeId);
   }
-  
+
   void *pVnode = vnodeAccquireVnode(pCreate->cfg.vgId);
   if (pVnode != NULL) {
     int32_t code = vnodeAlter(pVnode, pCreate);
diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
index aa53dddbe44483aaf9009e23847227bfa46ce826..e1aa48d47786898cb511b55a7913e8ee48d9158c 100644
--- a/src/dnode/src/dnodeModule.c
+++ b/src/dnode/src/dnodeModule.c
@@ -44,13 +44,13 @@ static void dnodeUnSetModuleStatus(int32_t module) {
 }
 
 static void dnodeAllocModules() {
-  tsModule[TSDB_MOD_MGMT].name         = false;
+  tsModule[TSDB_MOD_MGMT].enable       = false;
   tsModule[TSDB_MOD_MGMT].name         = "mgmt";
   tsModule[TSDB_MOD_MGMT].initFp       = mgmtInitSystem;
   tsModule[TSDB_MOD_MGMT].cleanUpFp    = mgmtCleanUpSystem;
   tsModule[TSDB_MOD_MGMT].startFp      = mgmtStartSystem;
   tsModule[TSDB_MOD_MGMT].stopFp       = mgmtStopSystem;
- 
+
   tsModule[TSDB_MOD_HTTP].enable       = (tsEnableHttpModule == 1);
   tsModule[TSDB_MOD_HTTP].name         = "http";
   tsModule[TSDB_MOD_HTTP].initFp       = httpInitSystem;
@@ -60,7 +60,7 @@ static void dnodeAllocModules() {
   if (tsEnableHttpModule) {
     dnodeSetModuleStatus(TSDB_MOD_HTTP);
   }
-  
+
   tsModule[TSDB_MOD_MONITOR].enable    = (tsEnableMonitorModule == 1);
   tsModule[TSDB_MOD_MONITOR].name      = "monitor";
   tsModule[TSDB_MOD_MONITOR].initFp    = monitorInitSystem;