diff --git a/src/dnode/inc/dnodeMClient.h b/src/dnode/inc/dnodeMClient.h
index fdaf54e0e5a21f0ef79d3a4158d0e8b2bfe1322b..6d413ada884cc874a8277888995b96fa3e70aa48 100644
--- a/src/dnode/inc/dnodeMClient.h
+++ b/src/dnode/inc/dnodeMClient.h
@@ -23,8 +23,6 @@ extern "C" {
 int32_t  dnodeInitMClient();
 void     dnodeCleanupMClient();
 void     dnodeSendMsgToMnode(SRpcMsg *rpcMsg);
-void *   dnodeGetMnodeList();
-int32_t  dnodeGetDnodeId();
 
 #ifdef __cplusplus
 }
diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index abfee2239bc7e8b2a6d9f339928ef51a63bc14fe..8f62e3adc09edf3fac58b43fc03f476630946733 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -22,11 +22,11 @@
 #include "trpc.h"
 #include "tsdb.h"
 #include "twal.h"
+#include "vnode.h"
 #include "dnodeMClient.h"
 #include "dnodeMgmt.h"
 #include "dnodeRead.h"
 #include "dnodeWrite.h"
-#include "vnode.h"
 
 static int32_t  dnodeOpenVnodes();
 static void     dnodeCloseVnodes();
diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
index c50391613eba3da6fafb9cb16219d63756a440d8..57ef655078d46d42516850692eb8730f22d5e7c6 100644
--- a/src/dnode/src/dnodeModule.c
+++ b/src/dnode/src/dnodeModule.c
@@ -118,7 +118,7 @@ void dnodeProcessModuleStatus(uint32_t moduleStatus) {
     dPrint("module status is received, start mgmt module", tsModuleStatus, moduleStatus);
     tsModule[TSDB_MOD_MGMT].enable = true;
     dnodeSetModuleStatus(TSDB_MOD_MGMT);
-    (*tsModule[TSDB_MOD_MGMT].stopFp)();
+    (*tsModule[TSDB_MOD_MGMT].startFp)();
   }
 
   if (tsModule[TSDB_MOD_MGMT].enable && !enableMgmtModule) {
diff --git a/src/inc/dnode.h b/src/inc/dnode.h
index 6215b5a7ee83d84b12ae34cddb16b0dc3c4746a5..0be18a007e831614d0e5362bccf32a7b529abc8b 100644
--- a/src/inc/dnode.h
+++ b/src/inc/dnode.h
@@ -43,6 +43,8 @@ void  dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code);
 
 bool  dnodeIsFirstDeploy();
 uint32_t dnodeGetMnodeMasteIp();
+void *   dnodeGetMnodeList();
+int32_t  dnodeGetDnodeId();
 
 #ifdef __cplusplus
 }
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 79d086153adb6acd5e1bf01d3e047f5c98636314..f292345e68636f1480c4c7c738965787362dbbe4 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -584,6 +584,7 @@ typedef struct {
   char       dnodeName[TSDB_NODE_NAME_LEN + 1];
   uint32_t   privateIp;
   uint32_t   publicIp;
+  uint32_t   moduleStatus;
   uint32_t   lastReboot;        // time stamp for last reboot
   uint16_t   numOfTotalVnodes;  // from config file
   uint16_t   openVnodes;
diff --git a/src/mnode/inc/mgmtDnode.h b/src/mnode/inc/mgmtDnode.h
index 14bb6e04e5226118e49ec4e516cd2751ff7f103f..48111d3110c7fc6b2f3e54c062329bdf9cfd70c2 100644
--- a/src/mnode/inc/mgmtDnode.h
+++ b/src/mnode/inc/mgmtDnode.h
@@ -31,7 +31,6 @@ int32_t mgmtInitDnodes();
 void    mgmtCleanupDnodes();
 
 char*   mgmtGetDnodeStatusStr(int32_t dnodeStatus);
-bool    mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType);
 void    mgmtMonitorDnodeModule();
 
 int32_t mgmtGetDnodesNum();
diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c
index 89c4796d85d68a7893830439b4f8c081c2fefd61..3c66ff6c57a61a56c361d1d125cedca152f2e2e0 100644
--- a/src/mnode/src/mgmtDnode.c
+++ b/src/mnode/src/mgmtDnode.c
@@ -129,7 +129,7 @@ static int32_t mgmtDnodeActionDecode(SSdbOperDesc *pOper) {
 
 static int32_t mgmtDnodeActionRestored() {
   int32_t numOfRows = sdbGetNumOfRows(tsDnodeSdb);
-  if (numOfRows <= 0 && strcmp(tsMasterIp, tsPrivateIp) == 0) {
+  if (numOfRows <= 0 && dnodeIsFirstDeploy()) {
     uint32_t ip = inet_addr(tsPrivateIp);
     mgmtCreateDnode(ip);
     SDnodeObj *pDnode = mgmtGetDnodeByIp(ip);
@@ -276,6 +276,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
   pStatus->dnodeId = htonl(pStatus->dnodeId);
   pStatus->privateIp = htonl(pStatus->privateIp);
   pStatus->publicIp = htonl(pStatus->publicIp);
+  pStatus->moduleStatus = htonl(pStatus->moduleStatus);
   pStatus->lastReboot = htonl(pStatus->lastReboot);
   pStatus->numOfCores = htons(pStatus->numOfCores);
   pStatus->numOfTotalVnodes = htons(pStatus->numOfTotalVnodes);
@@ -311,6 +312,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
   pDnode->diskAvailable    = pStatus->diskAvailable;
   pDnode->alternativeRole  = pStatus->alternativeRole;
   pDnode->totalVnodes      = pStatus->numOfTotalVnodes; 
+  pDnode->moduleStatus     = pStatus->moduleStatus;
   
   if (pStatus->dnodeId == 0) {
     mTrace("dnode:%d, first access, privateIp:%s, name:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp), pDnode->dnodeName);
@@ -353,7 +355,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
   mgmtGetMnodeList(&pRsp->mnodes);
 
   pRsp->dnodeState.dnodeId = htonl(pDnode->dnodeId);
-  pRsp->dnodeState.moduleStatus = htonl(pDnode->moduleStatus);
+  pRsp->dnodeState.moduleStatus = htonl((int32_t)pDnode->isMgmt);
   pRsp->dnodeState.createdTime  = htonl(pDnode->createdTime / 1000);
   pRsp->dnodeState.numOfVnodes = 0;
   
@@ -391,10 +393,6 @@ static int32_t mgmtCreateDnode(uint32_t ip) {
   pDnode->totalVnodes = TSDB_INVALID_VNODE_NUM; 
   sprintf(pDnode->dnodeName, "n%d", sdbGetId(tsDnodeSdb) + 1);
 
-  if (pDnode->privateIp == inet_addr(tsMasterIp)) {
-    pDnode->moduleStatus |= (1 << TSDB_MOD_MGMT);
-  }
-  
   SSdbOperDesc oper = {
     .type = SDB_OPER_GLOBAL,
     .table = tsDnodeSdb,
@@ -620,7 +618,7 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi
   return numOfRows;
 }
 
-bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) {
+static bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) {
   uint32_t status = pDnode->moduleStatus & (1 << moduleType);
   return status > 0;
 }
diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c
index 371a09c03f4b0ca2f00ae6887b988800e9721874..38f18b462ae69427088eea77bc7652ce9d144624 100644
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
@@ -20,6 +20,7 @@
 #include "treplica.h"
 #include "tgrant.h"
 #include "ttimer.h"
+#include "dnode.h"
 #include "mgmtDef.h"
 #include "mgmtLog.h"
 #include "mgmtAcct.h"
@@ -100,6 +101,10 @@ int32_t mgmtStartSystem() {
     return -1;
   }
 
+  if (replicaInit() < 0) {
+    mError("failed to init replica")
+  }
+
   if (mgmtInitDClient() < 0) {
     return -1;
   }
@@ -108,10 +113,6 @@ int32_t mgmtStartSystem() {
     return -1;
   }
 
-  if (replicaInit() < 0) {
-    mError("failed to init dnode balance")
-  }
-
   grantReset(TSDB_GRANT_ALL, 0);
   tsMgmtIsRunning = true;
 
diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c
index e469dc4f6f7ccbcf4a4ba3f2a878b1e0ffdcff1f..8087ce5ad1513cdc89795fbe745bad28c96c96f6 100644
--- a/src/mnode/src/mgmtMnode.c
+++ b/src/mnode/src/mgmtMnode.c
@@ -55,6 +55,12 @@ static int32_t mgmtMnodeActionInsert(SSdbOperDesc *pOper) {
 
 static int32_t mgmtMnodeActionDelete(SSdbOperDesc *pOper) {
   SMnodeObj *pMnode = pOper->pObj;
+
+  SDnodeObj *pDnode = mgmtGetDnode(pMnode->mnodeId);
+  if (pDnode == NULL) return TSDB_CODE_DNODE_NOT_EXIST;
+  pDnode->isMgmt = false;
+  mgmtReleaseDnode(pDnode);
+
   mTrace("mnode:%d, is dropped from sdb", pMnode->mnodeId);
   return TSDB_CODE_SUCCESS;
 }
diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c
index 013c0236d0b8240f20e2cc81e526562baf6d4d1c..4bc18d6a0de369bd417f4e8f9e4abdf7cc439e17 100644
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -69,10 +69,16 @@ static void *(*sdbGetIndexFp[])(void *handle, void *key) = {sdbGetStrHashData, s
 static void  (*sdbCleanUpIndexFp[])(void *handle) = {sdbCloseStrHash, sdbCloseIntHash, sdbCloseIntHash};
 static void *(*sdbFetchRowFp[])(void *handle, void *ptr, void **ppRow) = {sdbFetchStrHashData, sdbFetchIntHashData, sdbFetchIntHashData};
 
-uint64_t sdbGetVersion() { return tsSdbObj->version; }
 int32_t  sdbGetId(void *handle) { return ((SSdbTable *)handle)->autoIndex; }
 int64_t  sdbGetNumOfRows(void *handle) { return ((SSdbTable *)handle)->numOfRows; }
 
+uint64_t sdbGetVersion() {
+  if (tsSdbObj)
+    return tsSdbObj->version;
+  else
+    return 0;
+}
+
 static char *sdbGetActionStr(int32_t action) {
   switch (action) {
     case SDB_ACTION_INSERT:
@@ -147,10 +153,6 @@ void sdbCleanUp() {
   }
 }
 
-SSdbObject *sdbGetObj() {
-  return tsSdbObj;
-}
-
 void sdbIncRef(void *handle, void *pRow) {
   if (pRow) {
     SSdbTable *pTable = handle;
diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c
index 92037ba7932ef81c2d42cf25950a4ac5662261e2..9098a0c17d4db0c8b955cc5b97c187f1d56262d5 100644
--- a/src/mnode/src/mgmtUser.c
+++ b/src/mnode/src/mgmtUser.c
@@ -18,6 +18,7 @@
 #include "trpc.h"
 #include "ttime.h"
 #include "tutil.h"
+#include "dnode.h"
 #include "mgmtDef.h"
 #include "mgmtLog.h"
 #include "mgmtAcct.h"
@@ -93,7 +94,7 @@ static int32_t mgmtUserActionDecode(SSdbOperDesc *pOper) {
 }
 
 static int32_t mgmtUserActionRestored() {
-  if (strcmp(tsMasterIp, tsPrivateIp) == 0) {
+  if (dnodeIsFirstDeploy()) {
     SAcctObj *pAcct = mgmtGetAcct("root");
     mgmtCreateUser(pAcct, "root", "taosdata");
     mgmtCreateUser(pAcct, "monitor", tsInternalPass);
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
index 8ce4530dbf997b6673d4e8cdd903428ea0a07ddc..d91230164115408c029aee93e0a708c533aca8b8 100644
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
@@ -110,12 +110,7 @@ short tsDaysPerFile = 10;
 int   tsDaysToKeep = 3650;
 int   tsReplications = TSDB_REPLICA_MIN_NUM;
 
-#ifdef _MPEER
 int  tsNumOfMPeers = 3;
-#else
-int  tsNumOfMPeers = 1;
-#endif
-
 int  tsMaxShellConns = 2000;
 int  tsMaxTables = 100000;
 
@@ -556,7 +551,7 @@ static void doInitGlobalConfig() {
   tsInitConfigOption(cfg++, "tblocks", &tsNumOfBlocksPerMeter, TSDB_CFG_VTYPE_SHORT,
                      TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
                      32, 4096, 0, TSDB_CFG_UTYPE_NONE);
-#ifdef _MPEER                     
+#ifdef _SYNC                    
   tsInitConfigOption(cfg++, "numOfMPeers", &tsNumOfMPeers, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
                      1, 3, 0, TSDB_CFG_UTYPE_NONE);
diff --git a/src/wal/src/walMain.c b/src/wal/src/walMain.c
index edca4e371cdbc09cfe98f26e7b7972348c1e8098..9a9c658f1be4b3e403566af3ed7036f89b695a70 100644
--- a/src/wal/src/walMain.c
+++ b/src/wal/src/walMain.c
@@ -52,6 +52,7 @@ static uint32_t walSignature = 0xFAFBFDFE;
 static int walHandleExistingFiles(const char *path);
 static int walRestoreWalFile(const char *name, void *pVnode, FWalWrite writeFp);
 static int walRemoveWalFiles(const char *path);
+static int walMoveOldWalFilesBack(const char *path);
 
 void *walOpen(const char *path, const SWalCfg *pCfg) {
   SWal *pWal = calloc(sizeof(SWal), 1);
@@ -213,7 +214,11 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
   }
 
   if (code == 0) {
-    code = walRemoveWalFiles(opath);
+    if (pWal->keep) {
+      code = walMoveOldWalFilesBack(pWal->path);
+    } else {
+      code = walRemoveWalFiles(opath);
+    }
     if (code == 0) {
       if (remove(opath) < 0) {
         wError("wal:%s, failed to remove directory(%s)", opath, strerror(errno));
@@ -365,4 +370,40 @@ static int walRemoveWalFiles(const char *path) {
   return code;
 }
 
+int walMoveOldWalFilesBack(const char *path) {
+  char   oname[TSDB_FILENAME_LEN * 3];
+  char   nname[TSDB_FILENAME_LEN * 3];
+  char   opath[TSDB_FILENAME_LEN];
+  struct dirent *ent;
+  int    plen = strlen(walPrefix);
+  int    code = 0;
+
+  sprintf(opath, "%s/old", path);
+
+  if (access(opath, F_OK) == 0) {
+    // move all old files to wal directory
+    int count = 0;
+
+    DIR   *dir = opendir(opath);
+    while ((ent = readdir(dir))!= NULL) {  
+      if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
+        sprintf(oname, "%s/%s", opath, ent->d_name);
+        sprintf(nname, "%s/%s", path, ent->d_name);
+        if (rename(oname, nname) < 0) {
+          wError("wal:%s, failed to move to new:%s", oname, nname);
+          code = -1;
+          break;
+        } 
+
+        count++;
+      }
+    }
+
+    wTrace("wal:%s, %d old files are move back for keep option is set", path, count);
+    closedir(dir);
+  }
+  
+  return code;
+}
+