Merge remote-tracking branch 'origin/fix/TD-19245' into fix/TD-19441

source/dnode/mgmt/mgmt_vnode/src/vmFile.c

@@ -201,14 +201,13 @@ _OVER:
   taosCloseFile(&pFile);
   taosMemoryFree(content);
 
+  if (ppVnodes != NULL) {
     for (int32_t i = 0; i < numOfVnodes; ++i) {
       SVnodeObj *pVnode = ppVnodes[i];
       if (pVnode != NULL) {
         vmReleaseVnode(pMgmt, pVnode);
       }
     }
-
-  if (ppVnodes != NULL) {
     taosMemoryFree(ppVnodes);
   }
 

source/dnode/mnode/impl/src/mndMnode.c

@@ -87,7 +87,7 @@ static int32_t mndCreateDefaultMnode(SMnode *pMnode) {
 
   SSdbRaw *pRaw = mndMnodeActionEncode(&mnodeObj);
   if (pRaw == NULL) return -1;
-  sdbSetRawStatus(pRaw, SDB_STATUS_READY);
+  (void)sdbSetRawStatus(pRaw, SDB_STATUS_READY);
 
   mInfo("mnode:%d, will be created when deploying, raw:%p", mnodeObj.id, pRaw);
 

source/dnode/mnode/impl/src/mndVgroup.c

@@ -1532,10 +1532,9 @@ _OVER:
 
 int32_t mndBuildAlterVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup, SArray *pArray) {
   if (pVgroup->replica <= 0 || pVgroup->replica == pDb->cfg.replications) {
-    if (mndAddAlterVnodeAction(pMnode, pTrans, pDb, pVgroup, TDMT_VND_ALTER_CONFIG) != 0) {
-      return -1;
+    return mndAddAlterVnodeAction(pMnode, pTrans, pDb, pVgroup, TDMT_VND_ALTER_CONFIG);
   }
-  } else {
+
   SVgObj newVgroup = {0};
   memcpy(&newVgroup, pVgroup, sizeof(SVgObj));
   mndTransSetSerial(pTrans);
@@ -1591,7 +1590,6 @@ int32_t mndBuildAlterVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, S
     }
     (void)sdbSetRawStatus(pVgRaw, SDB_STATUS_READY);
   }
-  }
 
   return 0;
 }