diff --git a/include/util/tdef.h b/include/util/tdef.h
index 3d2f83bdfe444b10c7818844c4b1c94e53fd4bbd..e6d28ae3414dc9388bcd62d022c0dbf3fd5189bf 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -297,7 +297,7 @@ typedef enum ELogicConditionType {
 #define TSDB_MAX_BUFFER_PER_VNODE       16384  // unit MB
 #define TSDB_DEFAULT_BUFFER_PER_VNODE   96
 #define TSDB_MIN_PAGES_PER_VNODE        64
-#define TSDB_MAX_PAGES_PER_VNODE        INT32_MAX
+#define TSDB_MAX_PAGES_PER_VNODE        (INT32_MAX - 1)
 #define TSDB_DEFAULT_PAGES_PER_VNODE    256
 #define TSDB_MIN_PAGESIZE_PER_VNODE     1  // unit KB
 #define TSDB_MAX_PAGESIZE_PER_VNODE     16384
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
index d92440032c654b2a69d7dd462aa1458fc0e66cbd..b882e02e946353a1916bf3bdbe3e154ba1de04b5 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
@@ -145,7 +145,7 @@ _OVER:
 }
 
 int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
-  int32_t ret = 0;
+  int32_t code = 0;
   char    file[PATH_MAX] = {0};
   char    realfile[PATH_MAX] = {0};
   snprintf(file, sizeof(file), "%s%svnodes.json.bak", pMgmt->path, TD_DIRSEP);
@@ -159,10 +159,10 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
   }
 
   int32_t     numOfVnodes = 0;
-  SVnodeObj **pVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
-  if (pVnodes == NULL) {
+  SVnodeObj **ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
+  if (ppVnodes == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    ret = -1;
+    code = -1;
     goto _OVER;
   }
 
@@ -171,14 +171,14 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) {
   char   *content = taosMemoryCalloc(1, maxLen + 1);
   if (content == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    ret = -1;
+    code = -1;
     goto _OVER;
   }
 
   len += snprintf(content + len, maxLen - len, "{\n");
   len += snprintf(content + len, maxLen - len, "  \"vnodes\": [\n");
   for (int32_t i = 0; i < numOfVnodes; ++i) {
-    SVnodeObj *pVnode = pVnodes[i];
+    SVnodeObj *pVnode = ppVnodes[i];
     if (pVnode == NULL) continue;
 
     len += snprintf(content + len, maxLen - len, "    {\n");
@@ -202,15 +202,17 @@ _OVER:
   taosMemoryFree(content);
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
-    SVnodeObj *pVnode = pVnodes[i];
-    vmReleaseVnode(pMgmt, pVnode);
+    SVnodeObj *pVnode = ppVnodes[i];
+    if (pVnode != NULL) {
+      vmReleaseVnode(pMgmt, pVnode);
+    }
   }
 
-  if (pVnodes != NULL) {
-    taosMemoryFree(pVnodes);
+  if (ppVnodes != NULL) {
+    taosMemoryFree(ppVnodes);
   }
 
-  if (ret != 0) return -1;
+  if (code != 0) return -1;
 
   dDebug("successed to write %s, numOfVnodes:%d", realfile, numOfVnodes);
   return taosRenameFile(file, realfile);
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index cfb362c51cf4412693481c4b9e3d9e8caa4fd82a..4b76909a96670833ccd2c1f35778f0fc5155848b 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -104,7 +104,7 @@ static int32_t mndCreateDefaultMnode(SMnode *pMnode) {
     mndTransDrop(pTrans);
     return -1;
   }
-  sdbSetRawStatus(pRaw, SDB_STATUS_READY);
+  (void)sdbSetRawStatus(pRaw, SDB_STATUS_READY);
 
   if (mndTransPrepare(pMnode, pTrans) != 0) {
     mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr());