diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 802d383152734e584a0694b61cb226c1bc1328a3..6ab1b73d1e8fec5c910d17f36110e95ecc5f12d8 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -23,7 +23,7 @@
 #include "ttime.h"
 
 #define jniError(...)  { if (jniDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); }}
-#define jniWarn(...)   { if (jniDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  JNI ", jniDebugFlag, __VA_ARGS__); }}
+#define jniWarn(...)   { if (jniDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); }}
 #define jniTrace(...)  { if (jniDebugFlag & DEBUG_TRACE) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }}
 #define jniPrint(...)  { taosPrintLog("JNI ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
 
diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h
index a47e894e311245ca2c0006639e72bb98204e9984..07120d7cbe55e5d0dbeef89cc88acc065921b1de 100644
--- a/src/common/inc/tulog.h
+++ b/src/common/inc/tulog.h
@@ -26,7 +26,7 @@ extern int32_t uDebugFlag;
 extern int32_t tscEmbedded;
 
 #define uError(...)       { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR UTL ", uDebugFlag, __VA_ARGS__); }}
-#define uWarn(...)        { if (uDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  UTL ", uDebugFlag, __VA_ARGS__); }}
+#define uWarn(...)        { if (uDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN UTL ", uDebugFlag, __VA_ARGS__); }}
 #define uTrace(...)       { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
 #define uDump(x, y)       { if (uDebugFlag & DEBUG_DUMP)  { taosDumpData(x, y); }}
 #define uPrint(...)       { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
diff --git a/src/dnode/inc/dnodeInt.h b/src/dnode/inc/dnodeInt.h
index 663914a95908efdc1f4a93db36f7a3ff00d33e1f..34bfe6e4f7d7390631169c1d4d4cbd6bc09cc73e 100644
--- a/src/dnode/inc/dnodeInt.h
+++ b/src/dnode/inc/dnodeInt.h
@@ -25,7 +25,7 @@ extern "C" {
 extern int32_t dDebugFlag;
 
 #define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }}
-#define dWarn(...)  { if (dDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  DND ", dDebugFlag, __VA_ARGS__); }}
+#define dWarn(...)  { if (dDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); }}
 #define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
 #define dPrint(...) { taosPrintLog("DND ", 255, __VA_ARGS__); }
 
diff --git a/src/dnode/inc/dnodeMain.h b/src/dnode/inc/dnodeMain.h
index df7698ffc3246fbb419c554123b98ed74dbef9a7..c1480407bde0bbcf7aada20f90084b96fc380a73 100644
--- a/src/dnode/inc/dnodeMain.h
+++ b/src/dnode/inc/dnodeMain.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 int32_t dnodeInitSystem();
-void dnodeCleanUpSystem();
+void    dnodeCleanUpSystem();
 
 #ifdef __cplusplus
 }
diff --git a/src/dnode/inc/dnodeMgmt.h b/src/dnode/inc/dnodeMgmt.h
index 1a788610e5b5fe5e42206c4ece0cdd8c75ac64ce..4d15dc5a863273ed3fda017ee63405a9b8fd6973 100644
--- a/src/dnode/inc/dnodeMgmt.h
+++ b/src/dnode/inc/dnodeMgmt.h
@@ -34,7 +34,7 @@ void    dnodeReleaseVnode(void *pVnode);
 
 void    dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell);
 void    dnodeGetMnodeIpSetForPeer(void *ipSet);
-void    dnodeGetMnodeIpSetForShell(void *ipSe);
+void    dnodeGetMnodeIpSetForShell(void *ipSet);
 
 #ifdef __cplusplus
 }
diff --git a/src/dnode/inc/dnodePeer.h b/src/dnode/inc/dnodePeer.h
index 2ce8d80c0f7e2924d93f326418ec3819696a806a..0dcf48f2322be91de792148165b2a127fa983196 100644
--- a/src/dnode/inc/dnodePeer.h
+++ b/src/dnode/inc/dnodePeer.h
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_DNODE_DNODE_H
-#define TDENGINE_DNODE_DNODE_H
+#ifndef TDENGINE_DNODE_PEER_H
+#define TDENGINE_DNODE_PEER_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/dnode/src/dnodeMPeer.c b/src/dnode/src/dnodeMPeer.c
index f5b0fe26f29a3d803c7d0ec7f5ee03034f2ce595..da1910a691cbb6e44696f015bc4e0d02ca22e265 100644
--- a/src/dnode/src/dnodeMPeer.c
+++ b/src/dnode/src/dnodeMPeer.c
@@ -19,7 +19,6 @@
 #include "taosmsg.h"
 #include "tutil.h"
 #include "tqueue.h"
-#include "trpc.h"
 #include "twal.h"
 #include "tglobal.h"
 #include "mnode.h"
diff --git a/src/dnode/src/dnodeMRead.c b/src/dnode/src/dnodeMRead.c
index af93bfd11ecd3bede81b67dbb17021c65993f53e..f22346b61c3726858e319b1a40f7405efd94c7a2 100644
--- a/src/dnode/src/dnodeMRead.c
+++ b/src/dnode/src/dnodeMRead.c
@@ -19,7 +19,6 @@
 #include "taosmsg.h"
 #include "tutil.h"
 #include "tqueue.h"
-#include "trpc.h"
 #include "twal.h"
 #include "tglobal.h"
 #include "mnode.h"
diff --git a/src/dnode/src/dnodeMWrite.c b/src/dnode/src/dnodeMWrite.c
index 655964fb34fa61ba41d7a1a1002e4d7b2db5bfbe..95fa9f0bdd35f3829921a62db50913ca501fc872 100644
--- a/src/dnode/src/dnodeMWrite.c
+++ b/src/dnode/src/dnodeMWrite.c
@@ -20,7 +20,6 @@
 #include "tutil.h"
 #include "ttimer.h"
 #include "tqueue.h"
-#include "trpc.h"
 #include "twal.h"
 #include "tglobal.h"
 #include "mnode.h"
diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index 31e73eafbc60cc2b763aae2da0b6b8804124eb82..04457a95011439a9323610dab9411d699d02b3fc 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -20,7 +20,6 @@
 #include "taosmsg.h"
 #include "ttime.h"
 #include "ttimer.h"
-#include "trpc.h"
 #include "tsdb.h"
 #include "twal.h"
 #include "tsync.h"
diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
index 61c1ec9382a8d0bbfe02f431a13b46ecb2cfe05b..126ec27ed1580b00311f95e362136d1de67f8870 100644
--- a/src/dnode/src/dnodeModule.c
+++ b/src/dnode/src/dnodeModule.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "taosdef.h"
 #include "tglobal.h"
-#include "trpc.h"
 #include "mnode.h"
 #include "http.h"
 #include "mqtt.h"
diff --git a/src/dnode/src/dnodePeer.c b/src/dnode/src/dnodePeer.c
index bde6cd2aa74b0cd3a234fb339ee43665c4587683..9a7b0837e8167a2a0b9452d1db47bf2c85a3fbee 100644
--- a/src/dnode/src/dnodePeer.c
+++ b/src/dnode/src/dnodePeer.c
@@ -22,7 +22,6 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "tglobal.h"
-#include "trpc.h"
 #include "mnode.h"
 #include "dnode.h"
 #include "dnodeInt.h"
diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c
index bf40dd432608ddc0d4be44f678bee23dc199b96e..b875f465c2bbf3e0b3922d4b29eeae3a2cbef0ff 100644
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
@@ -18,7 +18,6 @@
 #include "taoserror.h"
 #include "taosdef.h"
 #include "taosmsg.h"
-#include "trpc.h"
 #include "tglobal.h"
 #include "http.h"
 #include "mnode.h"
diff --git a/src/dnode/src/dnodeVRead.c b/src/dnode/src/dnodeVRead.c
index c2ca9fcd026384d92eff6a6111199b86e5797b63..4b1ff84bec0e92d450f2c62b599279bfd7f7bc2e 100644
--- a/src/dnode/src/dnodeVRead.c
+++ b/src/dnode/src/dnodeVRead.c
@@ -19,7 +19,6 @@
 #include "taosmsg.h"
 #include "tutil.h"
 #include "tqueue.h"
-#include "trpc.h"
 #include "twal.h"
 #include "tglobal.h"
 #include "dnodeInt.h"
@@ -142,7 +141,7 @@ void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) {
   }
 }
 
-void *dnodeAllocateRqueue(void *pVnode) {
+void *dnodeAllocateVnodeRqueue(void *pVnode) {
   taos_queue queue = taosOpenQueue();
   if (queue == NULL) return NULL;
 
@@ -172,7 +171,7 @@ void *dnodeAllocateRqueue(void *pVnode) {
   return queue;
 }
 
-void dnodeFreeRqueue(void *rqueue) {
+void dnodeFreeVnodeRqueue(void *rqueue) {
   taosCloseQueue(rqueue);
 
   // dynamically adjust the number of threads
diff --git a/src/dnode/src/dnodeVWrite.c b/src/dnode/src/dnodeVWrite.c
index bf4e49e84d99efc59db009e79f88717ec1a73456..bbddfa09279160b903c1a2dc57a65b6271c8d3b9 100644
--- a/src/dnode/src/dnodeVWrite.c
+++ b/src/dnode/src/dnodeVWrite.c
@@ -22,9 +22,9 @@
 #include "trpc.h"
 #include "tsdb.h"
 #include "twal.h"
+#include "tdataformat.h"
 #include "tglobal.h"
 #include "vnode.h"
-#include "tdataformat.h"
 #include "dnodeInt.h"
 #include "dnodeVWrite.h"
 #include "dnodeMgmt.h"
@@ -122,7 +122,7 @@ void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
   }
 }
 
-void *dnodeAllocateWqueue(void *pVnode) {
+void *dnodeAllocateVnodeWqueue(void *pVnode) {
   SWriteWorker *pWorker = wWorkerPool.writeWorker + wWorkerPool.nextId;
   void *queue = taosOpenQueue();
   if (queue == NULL) return NULL;
@@ -157,13 +157,13 @@ void *dnodeAllocateWqueue(void *pVnode) {
   return queue;
 }
 
-void dnodeFreeWqueue(void *wqueue) {
+void dnodeFreeVnodeWqueue(void *wqueue) {
   taosCloseQueue(wqueue);
 
   // dynamically adjust the number of threads
 }
 
-void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code) {
+void dnodeSendRpcVnodeWriteRsp(void *pVnode, void *param, int32_t code) {
   SWriteMsg *pWrite = (SWriteMsg *)param;
 
   if (code > 0) return;
@@ -223,7 +223,7 @@ static void *dnodeProcessWriteQueue(void *param) {
       taosGetQitem(pWorker->qall, &type, &item);
       if (type == TAOS_QTYPE_RPC) {
         pWrite = (SWriteMsg *)item;
-        dnodeSendRpcWriteRsp(pVnode, item, pWrite->rpcMsg.code); 
+        dnodeSendRpcVnodeWriteRsp(pVnode, item, pWrite->rpcMsg.code); 
       } else {
         taosFreeQitem(item);
         vnodeRelease(pVnode);
diff --git a/src/inc/dnode.h b/src/inc/dnode.h
index ff4cc7f81fd73881395c8cddec04e45f628a33f9..3d3616085dc6333cbdfad5fea1cb333a48f7c8e5 100644
--- a/src/inc/dnode.h
+++ b/src/inc/dnode.h
@@ -37,12 +37,6 @@ typedef enum {
 SDnodeRunStatus dnodeGetRunStatus();
 SDnodeStatisInfo dnodeGetStatisInfo();
 
-void *dnodeAllocateWqueue(void *pVnode);
-void  dnodeFreeWqueue(void *queue);
-void *dnodeAllocateRqueue(void *pVnode);
-void  dnodeFreeRqueue(void *rqueue);
-void  dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code);
-
 bool    dnodeIsFirstDeploy();
 char *  dnodeGetMnodeMasterEp();
 void    dnodeGetMnodeIpSetForPeer(void *ipSet);
@@ -54,16 +48,21 @@ void dnodeAddClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
 void dnodeSendMsgToDnode(SRpcIpSet *ipSet, SRpcMsg *rpcMsg);
 void dnodeSendMsgToDnodeRecv(SRpcMsg *rpcMsg, SRpcMsg *rpcRsp);
 
-int32_t dnodeAllocateMnodeWqueue();
-void    dnodeFreeMnodeWqueue();
-int32_t dnodeAllocateMnodeRqueue();
-void    dnodeFreeMnodeRqueue();
+void *dnodeAllocateVnodeWqueue(void *pVnode);
+void  dnodeFreeVnodeWqueue(void *queue);
+void *dnodeAllocateVnodeRqueue(void *pVnode);
+void  dnodeFreeVnodeRqueue(void *rqueue);
+void  dnodeSendRpcVnodeWriteRsp(void *pVnode, void *param, int32_t code);
+
 int32_t dnodeAllocateMnodePqueue();
 void    dnodeFreeMnodePqueue();
-
-void dnodeSendRpcMnodeWriteRsp(void *pMsg, int32_t code);
-void dnodeReprocessMnodeWriteMsg(void *pMsg);
-void dnodeDelayReprocessMnodeWriteMsg(void *pMsg);
+int32_t dnodeAllocateMnodeRqueue();
+void    dnodeFreeMnodeRqueue();
+int32_t dnodeAllocateMnodeWqueue();
+void    dnodeFreeMnodeWqueue();
+void    dnodeSendRpcMnodeWriteRsp(void *pMsg, int32_t code);
+void    dnodeReprocessMnodeWriteMsg(void *pMsg);
+void    dnodeDelayReprocessMnodeWriteMsg(void *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/src/inc/mnode.h b/src/inc/mnode.h
index 513e81a4614becd8e3cdc8b2aab9a7937a5bf03e..6f0c4d69498dc16f45fe4c5c8693c6b0026969f7 100644
--- a/src/inc/mnode.h
+++ b/src/inc/mnode.h
@@ -20,13 +20,14 @@
 extern "C" {
 #endif
 
+#include "trpc.h"
+
 struct SAcctObj;
 struct SDnodeObj;
 struct SUserObj;
 struct SDbObj;
 struct SVgObj;
 struct STableObj;
-struct SRpcMsg;
 
 typedef struct {
   int32_t len;
@@ -34,13 +35,13 @@ typedef struct {
 } SMnodeRsp;
 
 typedef struct SMnodeMsg {
+  SRpcMsg   rpcMsg;
   SMnodeRsp rpcRsp;
   int8_t    received;
   int8_t    successed;
   int8_t    expected;
   int8_t    retry;
   int32_t   code;
-  struct SRpcMsg    rpcMsg;
   struct SAcctObj * pAcct;
   struct SDnodeObj *pDnode;
   struct SUserObj * pUser;
@@ -49,7 +50,7 @@ typedef struct SMnodeMsg {
   struct STableObj *pTable;
 } SMnodeMsg;
 
-void    mnodeCreateMsg(SMnodeMsg *pMsg, struct SRpcMsg *rpcMsg);
+void    mnodeCreateMsg(SMnodeMsg *pMsg, SRpcMsg *rpcMsg);
 int32_t mnodeInitMsg(SMnodeMsg *pMsg);
 void    mnodeCleanupMsg(SMnodeMsg *pMsg);
 
@@ -62,7 +63,7 @@ bool    mnodeIsRunning();
 int32_t mnodeProcessRead(SMnodeMsg *pMsg);
 int32_t mnodeProcessWrite(SMnodeMsg *pMsg);
 int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg);
-void    mnodeProcessPeerRsp(struct SRpcMsg *pMsg);
+void    mnodeProcessPeerRsp(SRpcMsg *pMsg);
 int32_t mnodeRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey);
 
 #ifdef __cplusplus
diff --git a/src/mnode/inc/mnodeInt.h b/src/mnode/inc/mnodeInt.h
index 52259d0134c754a8a4746c313daf9fac08df58fe..7405cef6f3ce9786864db8ff69a9e248c7dfc53b 100644
--- a/src/mnode/inc/mnodeInt.h
+++ b/src/mnode/inc/mnodeInt.h
@@ -28,7 +28,7 @@ extern int32_t sdbDebugFlag;
 
 // mnode log function
 #define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); }}
-#define mWarn(...)  { if (mDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  MND ", mDebugFlag, __VA_ARGS__); }}
+#define mWarn(...)  { if (mDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN MND ", mDebugFlag, __VA_ARGS__); }}
 #define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
 #define mPrint(...) { taosPrintLog("MND ", 255, __VA_ARGS__); }
 
@@ -37,7 +37,7 @@ extern int32_t sdbDebugFlag;
 #define mLPrint(...) { monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__) }
 
 #define sdbError(...) { if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); }}
-#define sdbWarn(...)  { if (sdbDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  MND-SDB ", sdbDebugFlag, __VA_ARGS__); }}
+#define sdbWarn(...)  { if (sdbDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN MND-SDB ", sdbDebugFlag, __VA_ARGS__); }}
 #define sdbTrace(...) { if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);}}
 #define sdbPrint(...) { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); }
 
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index 827fef9ed6fe0bf817a1099b0e8925acd1c44c2a..c6c023225979829bdd0280d1798998beb58d1819 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -15,7 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "trpc.h"
 #include "tgrant.h"
 #include "tbalance.h"
 #include "tglobal.h"
diff --git a/src/mnode/src/mnodePeer.c b/src/mnode/src/mnodePeer.c
index 3594b60cf18c3b41991d37335466e21919d87792..d3699948f21de905d3e907835710f2d82a2172f1 100644
--- a/src/mnode/src/mnodePeer.c
+++ b/src/mnode/src/mnodePeer.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taoserror.h"
-#include "trpc.h"
 #include "tsched.h"
 #include "tsystem.h"
 #include "tutil.h"
diff --git a/src/mnode/src/mnodeRead.c b/src/mnode/src/mnodeRead.c
index cc58f8904135fa4dd462f41d5aa735d4522fc3c9..0ee917f2d1322a00f97ec5dc2866266c86d14d6c 100644
--- a/src/mnode/src/mnodeRead.c
+++ b/src/mnode/src/mnodeRead.c
@@ -15,7 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "trpc.h"
 #include "taosdef.h"
 #include "tsched.h"
 #include "tbalance.h"
diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index 3b04be1ea63c4bfc9663aae87c97e12cf5e58b8a..3905773d54da77239d66d94d4c2602530f128959 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "taoserror.h"
 #include "hash.h"
-#include "trpc.h"
 #include "tutil.h"
 #include "tbalance.h"
 #include "tqueue.h"
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index c29c3dab6841ce836c59c6ba38b9d62e0a678110..0a522e8f99f6a397e5e3fde6b186f0d7033c4274 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "taoserror.h"
-#include "trpc.h"
 #include "tsched.h"
 #include "tutil.h"
 #include "ttimer.h"
diff --git a/src/plugins/http/inc/httpLog.h b/src/plugins/http/inc/httpLog.h
index 0e09f277f0de9a5d1860fc63e4765476af57df9b..a940dcf6ec0036ef7ebc82d1d3456f2ef70aaabe 100644
--- a/src/plugins/http/inc/httpLog.h
+++ b/src/plugins/http/inc/httpLog.h
@@ -21,7 +21,7 @@
 extern int32_t httpDebugFlag;
 
 #define httpError(...) { if (httpDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR HTP ", 255, __VA_ARGS__); }}
-#define httpWarn(...)  { if (httpDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  HTP ", httpDebugFlag, __VA_ARGS__); }}
+#define httpWarn(...)  { if (httpDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN HTP ", httpDebugFlag, __VA_ARGS__); }}
 #define httpTrace(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); }}
 #define httpDump(...)  { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); }}
 #define httpPrint(...) { taosPrintLog("HTP ", 255, __VA_ARGS__); }
diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c
index fc958c1b1fb408afcd5c6a4d27a9eb4632731bcf..0c27233289ce054625e3512374748206f54176df 100644
--- a/src/plugins/monitor/src/monitorMain.c
+++ b/src/plugins/monitor/src/monitorMain.c
@@ -28,7 +28,7 @@
 #include "monitor.h"
 
 #define monitorError(...) { if (monitorDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MON ", 255, __VA_ARGS__); }}
-#define monitorWarn(...)  { if (monitorDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  MON ", monitorDebugFlag, __VA_ARGS__); }}
+#define monitorWarn(...)  { if (monitorDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN MON ", monitorDebugFlag, __VA_ARGS__); }}
 #define monitorTrace(...) { if (monitorDebugFlag & DEBUG_TRACE) { taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); }}
 #define monitorPrint(...) { taosPrintLog("MON ", 255, __VA_ARGS__); }
 
diff --git a/src/plugins/mqtt/inc/mqttLog.h b/src/plugins/mqtt/inc/mqttLog.h
index 735678a326c0842c1c3084ad203255991a0e3615..a7ae2fc1ae70151a4d2133f3be53bbdafcdb50e2 100644
--- a/src/plugins/mqtt/inc/mqttLog.h
+++ b/src/plugins/mqtt/inc/mqttLog.h
@@ -26,7 +26,7 @@ extern int32_t mqttDebugFlag;
   }
 #define mqttWarn(...)                                  \
   if ( mqttDebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  MQT ",  mqttDebugFlag, __VA_ARGS__); \
+    taosPrintLog("WARN MQT ",  mqttDebugFlag, __VA_ARGS__); \
   }
 #define  mqttTrace(...)                           \
   if ( mqttDebugFlag & DEBUG_TRACE) {             \
diff --git a/src/rpc/inc/rpcLog.h b/src/rpc/inc/rpcLog.h
index 5094d817572a66da4f5cfcebbd17172fe0a58d89..10ef974298ad962a9d003841dabc7a1c7db12ab8 100644
--- a/src/rpc/inc/rpcLog.h
+++ b/src/rpc/inc/rpcLog.h
@@ -25,7 +25,7 @@ extern "C" {
 extern int32_t rpcDebugFlag;
 
 #define tError(...) { if (rpcDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); }}
-#define tWarn(...)  { if (rpcDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  RPC ", rpcDebugFlag, __VA_ARGS__); }}
+#define tWarn(...)  { if (rpcDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN RPC ", rpcDebugFlag, __VA_ARGS__); }}
 #define tTrace(...) { if (rpcDebugFlag & DEBUG_TRACE) { taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); }}
 #define tDump(x, y) { if (rpcDebugFlag & DEBUG_DUMP)  { taosDumpData((unsigned char *)x, y); }}
 #define tPrint(...) { taosPrintLog("RPC ", 255, __VA_ARGS__); }
diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index e6ef73ef57d3da8a8961c9673096e7f6e6a33e1a..68db574d82f3e668ced4b8895c3427640641079e 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -27,7 +27,7 @@
 
 #define tmrWarn(...)                                  \
   do { if (tmrDebugFlag & DEBUG_WARN) {               \
-    taosPrintLog("WARN  TMR ", tmrDebugFlag, __VA_ARGS__); \
+    taosPrintLog("WARN TMR ", tmrDebugFlag, __VA_ARGS__); \
   } } while(0)
 
 #define tmrTrace(...)                           \
diff --git a/src/vnode/inc/vnodeInt.h b/src/vnode/inc/vnodeInt.h
index dea9369dd8d08c6cc26dc6049b65fa6ec11e7682..0168304b5158a1a76bae06cce1b9b3dc0132360b 100644
--- a/src/vnode/inc/vnodeInt.h
+++ b/src/vnode/inc/vnodeInt.h
@@ -27,10 +27,10 @@ extern "C" {
 
 extern int32_t vDebugFlag;
 
-#define vError(...) if (vDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR VND ", 255, __VA_ARGS__); }
-#define vWarn(...) if (vDebugFlag & DEBUG_WARN) {taosPrintLog("WARN  VND ", vDebugFlag, __VA_ARGS__); }
-#define vTrace(...) if (vDebugFlag & DEBUG_TRACE) {taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }
-#define vPrint(...) {taosPrintLog("VND ", 255, __VA_ARGS__); }
+#define vError(...) { if (vDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR VND ", 255, __VA_ARGS__); }}
+#define vWarn(...)  { if (vDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN VND ", vDebugFlag, __VA_ARGS__); }}
+#define vTrace(...) { if (vDebugFlag & DEBUG_TRACE) { taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }}
+#define vPrint(...) { taosPrintLog("VND ", 255, __VA_ARGS__); }
 
 typedef struct {
   int32_t      vgId;      // global vnode group ID
diff --git a/src/vnode/inc/vnodeLog.h b/src/vnode/inc/vnodeLog.h
index bd8daae0b637c75188539e4cd7f9fb9579ede3c6..d6794202da416a72e8be6fd82ddceaa295076f2a 100644
--- a/src/vnode/inc/vnodeLog.h
+++ b/src/vnode/inc/vnodeLog.h
@@ -24,20 +24,10 @@ extern "C" {
 
 extern int32_t dDebugFlag;
 
-#define dError(...)                          \
-  if (dDebugFlag & DEBUG_ERROR) {            \
-    taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \
-  }
-#define dWarn(...)                                  \
-  if (dDebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  DND ", dDebugFlag, __VA_ARGS__); \
-  }
-#define dTrace(...)                           \
-  if (dDebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); \
-  }
-#define dPrint(...) \
-  { taosPrintLog("DND ", 255, __VA_ARGS__); }
+#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }}
+#define dWarn(...)  { if (dDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); }}
+#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
+#define dPrint(...) { taosPrintLog("DND ", 255, __VA_ARGS__); }
 
 #ifdef __cplusplus
 }
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index b8bc29550e3ee810b850b12922debbe06dfbe104..b25180f0f0e1470405b8e9605f0869640b35d8a7 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -198,8 +198,8 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
 
   pVnode->fversion = pVnode->version;
   
-  pVnode->wqueue = dnodeAllocateWqueue(pVnode);
-  pVnode->rqueue = dnodeAllocateRqueue(pVnode);
+  pVnode->wqueue = dnodeAllocateVnodeWqueue(pVnode);
+  pVnode->rqueue = dnodeAllocateVnodeRqueue(pVnode);
   if (pVnode->wqueue == NULL || pVnode->rqueue == NULL) {
     vnodeCleanUp(pVnode);
     return terrno;
@@ -245,7 +245,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   syncInfo.getWalInfo = vnodeGetWalInfo;
   syncInfo.getFileInfo = vnodeGetFileInfo;
   syncInfo.writeToCache = vnodeWriteToQueue;
-  syncInfo.confirmForward = dnodeSendRpcWriteRsp; 
+  syncInfo.confirmForward = dnodeSendRpcVnodeWriteRsp; 
   syncInfo.notifyRole = vnodeNotifyRole;
   syncInfo.notifyFileSynced = vnodeNotifyFileSynced;
   pVnode->sync = syncStart(&syncInfo);
@@ -404,11 +404,11 @@ static void vnodeCleanUp(SVnodeObj *pVnode) {
   pVnode->cq = NULL;
 
   if (pVnode->wqueue) 
-    dnodeFreeWqueue(pVnode->wqueue);
+    dnodeFreeVnodeWqueue(pVnode->wqueue);
   pVnode->wqueue = NULL;
 
   if (pVnode->rqueue) 
-    dnodeFreeRqueue(pVnode->rqueue);
+    dnodeFreeVnodeRqueue(pVnode->rqueue);
   pVnode->rqueue = NULL;
  
   vnodeRelease(pVnode);