diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c
index 37edddec107904fbc3ef9c5de0fa476892a391a0..434552980fb22657cffcb79080b85473d6e5e574 100644
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
@@ -55,11 +55,6 @@ int32_t mgmtStartSystem() {
     return -1;
   }
 
-  if (grantInit() < 0) {
-    mError("failed to init grant");
-    return -1;
-  }
-
   if (mgmtInitUsers() < 0) {
     mError("failed to init users");
     return -1;
@@ -99,6 +94,11 @@ int32_t mgmtStartSystem() {
     mError("failed to init balance")
   }
 
+  if (grantInit() < 0) {
+    mError("failed to init grant");
+    return -1;
+  }
+
   if (mgmtInitServer() < 0) {
     return -1;
   }
@@ -132,19 +132,18 @@ int32_t mgmtInitSystem() {
 
 void mgmtCleanUpSystem() {
   mPrint("starting to clean up mgmt");
-  grantCleanUp();
-  mgmtCleanupMnodes();
-  balanceCleanUp();
   mgmtCleanUpShell();
   mgmtCleanupServer();
-  mgmtCleanUpAccts();
+  grantCleanUp();
+  balanceCleanUp();
+  sdbCleanUp();
+  mgmtCleanupMnodes();
   mgmtCleanUpTables();
   mgmtCleanUpVgroups();
   mgmtCleanUpDbs();
   mgmtCleanupDnodes();
   mgmtCleanUpUsers();
-  sdbCleanUp();
-  taosTmrCleanUp(tsMgmtTmr);
+  mgmtCleanUpAccts();
   tsMgmtIsRunning = false;
   mPrint("mgmt is cleaned up");
 }
diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c
index 3cb0225b970fa76ba307fa22e0180f93e0720fd9..c869e752d3e6f9f68fd4f7ed7502704254b4f649 100644
--- a/src/mnode/src/mgmtShell.c
+++ b/src/mnode/src/mgmtShell.c
@@ -66,21 +66,26 @@ int32_t mgmtInitShell() {
   
   tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND");
   tsMgmtTranQhandle = taosInitScheduler(tsMaxShellConns, 1, "mnodeT");
-  tsQhandleCache = taosCacheInit(tsMgmtTmr, 2);
+  tsQhandleCache = taosCacheInit(tsMgmtTmr, 10);
 
   return 0;
 }
 
 void mgmtCleanUpShell() {
-  if (tsMgmtTranQhandle) {
-    taosCleanUpScheduler(tsMgmtTranQhandle);
-    tsMgmtTranQhandle = NULL;
+  if (tsMgmtTmr != NULL){
+    taosTmrCleanUp(tsMgmtTmr);
+    tsMgmtTmr = NULL;
   }
 
-  if (tsQhandleCache) {
+  if (tsQhandleCache != NULL) {
     taosCacheCleanup(tsQhandleCache);
     tsQhandleCache = NULL;
   }
+  
+  if (tsMgmtTranQhandle != NULL) {
+    taosCleanUpScheduler(tsMgmtTranQhandle);
+    tsMgmtTranQhandle = NULL;
+  }
 }
 
 void mgmtAddShellMsgHandle(uint8_t showType, void (*fp)(SQueuedMsg *queuedMsg)) {
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
index ae3c386122102fa13ccc75de90ee90709ccbadc7..50692524cf65d121cad8f23dce3e707050520c8d 100644
--- a/tests/script/unique/mnode/mgmt22.sim
+++ b/tests/script/unique/mnode/mgmt22.sim
@@ -8,7 +8,8 @@ system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
 print ============== step1
-system sh/exec_up.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start -t
+sleep 3000
 sql connect
 
 sql show mnodes
@@ -19,7 +20,7 @@ if $data2_1 != master then
 endi
 
 print ============== step2
-system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start -t
 sql create dnode $hostname2
 
 $x = 0
@@ -44,8 +45,12 @@ print ============== step3
 sql_error drop dnode $hostname1 -x error1
 print should not drop master
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+return
+
 print ============== step4
-system sh/exec_up.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sql_error show mnodes
 print error of no master
 
@@ -78,7 +83,7 @@ if $data2_2 != slave then
 endi
 
 print ============== step7
-system sh/exec_up.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start -t
 sql create dnode $hostname3
 sleep 5000