From c95fc014a8de592834e238bb4bed396a97e3ad2e Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 3 Nov 2023 14:57:36 +0800
Subject: [PATCH] enh: rsma checkpoint

---
 source/dnode/vnode/src/inc/sma.h         | 2 +-
 source/dnode/vnode/src/sma/smaOpen.c     | 2 +-
 source/dnode/vnode/src/vnd/vnodeCommit.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/inc/sma.h b/source/dnode/vnode/src/inc/sma.h
index 63d6e7e5c2..e87b356be7 100644
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
@@ -155,7 +155,7 @@ struct SRSmaInfo {
   int64_t   lastRecv;  // ms
   int8_t    assigned;  // 0 idle, 1 assgined for exec
   int8_t    delFlag;
-  int8_t    padding;
+  int16_t   padding;
   T_REF_DECLARE()
   SRSmaInfoItem items[TSDB_RETENTION_L2];
   void         *taskInfo[TSDB_RETENTION_L2];  // qTaskInfo_t
diff --git a/source/dnode/vnode/src/sma/smaOpen.c b/source/dnode/vnode/src/sma/smaOpen.c
index c0af670a17..633e096314 100644
--- a/source/dnode/vnode/src/sma/smaOpen.c
+++ b/source/dnode/vnode/src/sma/smaOpen.c
@@ -22,7 +22,7 @@ static int32_t rsmaRestore(SSma *pSma);
 
 #define SMA_SET_KEEP_CFG(v, l)                                                                    \
   do {                                                                                            \
-    SRetention *r = &(pCfg->retentions[l]);                                                       \
+    SRetention *r = &pCfg->retentions[l];                                                         \
     pKeepCfg->keep2 = convertTimeFromPrecisionToUnit(r->keep, pCfg->precision, TIME_UNIT_MINUTE); \
     pKeepCfg->keep0 = pKeepCfg->keep2;                                                            \
     pKeepCfg->keep1 = pKeepCfg->keep2;                                                            \
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 9e0106dff4..50ca2f5d03 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -291,9 +291,6 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
 
   if(syncNodeGetConfig(pVnode->sync, &pVnode->config.syncCfg) != 0) goto _exit;
 
-  code = smaPrepareAsyncCommit(pVnode->pSma);  // prepare checkpointId and save to vnode.json
-  if (code) goto _exit;
-
   pVnode->state.commitTerm = pVnode->state.applyTerm;
 
   pInfo->info.config = pVnode->config;
@@ -316,6 +313,9 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
 
   metaPrepareAsyncCommit(pVnode->pMeta);
 
+  code = smaPrepareAsyncCommit(pVnode->pSma);
+  if (code) goto _exit;
+
   taosThreadMutexLock(&pVnode->mutex);
   ASSERT(pVnode->onCommit == NULL);
   pVnode->onCommit = pVnode->inUse;