diff --git a/source/dnode/vnode/src/sma/smaFS.c b/source/dnode/vnode/src/sma/smaFS.c
index 1211ef9405..37a19529cb 100644
--- a/source/dnode/vnode/src/sma/smaFS.c
+++ b/source/dnode/vnode/src/sma/smaFS.c
@@ -99,8 +99,9 @@ _exit:
 }
 
 static int32_t tdRSmaSaveFSToFile(SRSmaFS *pFS, const char *fname) {
-  int32_t code = 0;
-  int32_t lino = 0;
+  int32_t   code = 0;
+  int32_t   lino = 0;
+  TdFilePtr pFD = NULL;
 
   // encode to binary
   int32_t  size = tdRSmaFSToBinary(NULL, pFS) + sizeof(TSCKSUM);
@@ -113,8 +114,8 @@ static int32_t tdRSmaSaveFSToFile(SRSmaFS *pFS, const char *fname) {
   taosCalcChecksumAppend(0, pData, size);
 
   // save to file
-  TdFilePtr pFD = taosCreateFile(fname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
-  if (pFD == NULL) {
+  pFD = taosCreateFile(fname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
+  if (!pFD) {
     code = TAOS_SYSTEM_ERROR(errno);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
@@ -122,19 +123,16 @@ static int32_t tdRSmaSaveFSToFile(SRSmaFS *pFS, const char *fname) {
   int64_t n = taosWriteFile(pFD, pData, size);
   if (n < 0) {
     code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   if (taosFsyncFile(pFD) < 0) {
     code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
-  taosCloseFile(&pFD);
-
 _exit:
+  taosCloseFile(&pFD);
   if (pData) taosMemoryFree(pData);
   if (code) {
     smaError("%s failed at line %d since %s, fname:%s", __func__, lino, tstrerror(code), fname);
@@ -193,36 +191,31 @@ static int32_t tdRSmaLoadFSFromFile(const char *fname, SRSmaFS *pFS) {
   int64_t size;
   if (taosFStatFile(pFD, &size, NULL) < 0) {
     code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   pData = taosMemoryMalloc(size);
   if (pData == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   if (taosReadFile(pFD, pData, size) < 0) {
     code = TAOS_SYSTEM_ERROR(errno);
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
   if (!taosCheckChecksumWhole(pData, size)) {
     code = TSDB_CODE_FILE_CORRUPTED;
-    taosCloseFile(&pFD);
     TSDB_CHECK_CODE(code, lino, _exit);
   }
 
-  taosCloseFile(&pFD);
-
   // decode binary
   code = tsdbBinaryToFS(pData, size, pFS);
   TSDB_CHECK_CODE(code, lino, _exit);
 
 _exit:
+  taosCloseFile(&pFD);
   if (pData) taosMemoryFree(pData);
   if (code) {
     smaError("%s failed at line %d since %s, fname:%s", __func__, lino, tstrerror(code), fname);
diff --git a/source/dnode/vnode/src/sma/smaOpen.c b/source/dnode/vnode/src/sma/smaOpen.c
index 00000cb129..4dc3e45ffe 100644
--- a/source/dnode/vnode/src/sma/smaOpen.c
+++ b/source/dnode/vnode/src/sma/smaOpen.c
@@ -101,10 +101,6 @@ int smaSetKeepCfg(SVnode *pVnode, STsdbKeepCfg *pKeepCfg, STsdbCfg *pCfg, int ty
   terrno = 0;
   pKeepCfg->precision = pCfg->precision;
   switch (type) {
-    case TSDB_TYPE_TSMA:
-      ASSERTS(0, "undefined smaType:%d", (int32_t)type);
-      terrno = TSDB_CODE_APP_ERROR;
-      break;
     case TSDB_TYPE_RSMA_L0:
       SMA_SET_KEEP_CFG(pVnode, 0);
       break;
@@ -115,7 +111,6 @@ int smaSetKeepCfg(SVnode *pVnode, STsdbKeepCfg *pKeepCfg, STsdbCfg *pCfg, int ty
       SMA_SET_KEEP_CFG(pVnode, 2);
       break;
     default:
-      ASSERTS(0, "unknown smaType:%d", (int32_t)type);
       terrno = TSDB_CODE_APP_ERROR;
       break;
   }
@@ -189,8 +184,7 @@ int32_t smaClose(SSma *pSma) {
  */
 int32_t tdRSmaRestore(SSma *pSma, int8_t type, int64_t committedVer, int8_t rollback) {
   if (!VND_IS_RSMA(pSma->pVnode)) {
-    terrno = TSDB_CODE_RSMA_INVALID_ENV;
-    return TSDB_CODE_FAILED;
+    return TSDB_CODE_RSMA_INVALID_ENV;
   }
 
   return tdRSmaProcessRestoreImpl(pSma, type, committedVer, rollback);
diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c
index b6a20377f8..067ac33d3c 100644
--- a/source/dnode/vnode/src/sma/smaRollup.c
+++ b/source/dnode/vnode/src/sma/smaRollup.c
@@ -1213,33 +1213,35 @@ _exit:
  * N.B. the data would be restored from the unified WAL replay procedure
  */
 int32_t tdRSmaProcessRestoreImpl(SSma *pSma, int8_t type, int64_t qtaskFileVer, int8_t rollback) {
+  int32_t code = 0;
+  int64_t nTables = 0;
+
   // step 1: init env
   if (tdCheckAndInitSmaEnv(pSma, TSDB_SMA_TYPE_ROLLUP) != TSDB_CODE_SUCCESS) {
-    terrno = TSDB_CODE_TDB_INIT_FAILED;
-    return TSDB_CODE_FAILED;
+    code = TSDB_CODE_TDB_INIT_FAILED;
+    goto _err;
   }
 
   // step 2: open SRSmaFS for qTaskFiles
-  if (tdRSmaFSOpen(pSma, qtaskFileVer, rollback) < 0) {
+  if ((code = tdRSmaFSOpen(pSma, qtaskFileVer, rollback)) < 0) {
     goto _err;
   }
 
   // step 3: iterate all stables to restore the rsma env
-  int64_t nTables = 0;
-  if (tdRSmaRestoreQTaskInfoInit(pSma, &nTables) < 0) {
+  if ((code = tdRSmaRestoreQTaskInfoInit(pSma, &nTables)) < 0) {
     goto _err;
   }
-  if (nTables <= 0) {
-    smaDebug("vgId:%d, no need to restore rsma task %" PRIi8 " since no tables", SMA_VID(pSma), type);
-    return TSDB_CODE_SUCCESS;
+
+_err:
+  if (code) {
+    smaError("vgId:%d, restore rsma task %" PRIi8 "from qtaskf %" PRIi64 " failed since %s", SMA_VID(pSma), type,
+             qtaskFileVer, tstrerror(code));
+  } else {
+    smaInfo("vgId:%d, restore rsma task %" PRIi8 " from qtaskf %" PRIi64 " succeed, nTables:%" PRIi64, SMA_VID(pSma),
+            type, qtaskFileVer, nTables);
   }
 
-  smaInfo("vgId:%d, restore rsma task %" PRIi8 " from qtaskf %" PRIi64 " succeed", SMA_VID(pSma), type, qtaskFileVer);
-  return TSDB_CODE_SUCCESS;
-_err:
-  smaError("vgId:%d, restore rsma task %" PRIi8 "from qtaskf %" PRIi64 " failed since %s", SMA_VID(pSma), type,
-           qtaskFileVer, terrstr());
-  return TSDB_CODE_FAILED;
+  return code;
 }
 
 int32_t tdRSmaPersistExecImpl(SRSmaStat *pRSmaStat, SHashObj *pInfoHash) {
diff --git a/source/dnode/vnode/src/sma/smaTimeRange.c b/source/dnode/vnode/src/sma/smaTimeRange.c
index 9a547120f6..4fa1edce57 100644
--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
@@ -419,8 +419,8 @@ static int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char
 
 _exit:
   if (code) {
-    smaError("vgId:%d, %s failed at line %d since %s, smaIndex:%PRIi64", SMA_VID(pSma), __func__, lino, tstrerror(code),
-             indexUid);
+    smaError("vgId:%d, %s failed at line %d since %s, smaIndex:%" PRIi64, SMA_VID(pSma), __func__, lino,
+             tstrerror(code), indexUid);
   }
   return code;
 }