more code

source/dnode/vnode/src/inc/vnodeInt.h

@@ -241,6 +241,7 @@ int32_t tsdbSnapRead(STsdbSnapReader* pReader, uint8_t** ppData);
 // STsdbSnapWriter ========================================
 int32_t tsdbSnapWriterOpen(STsdb* pTsdb, int64_t sver, int64_t ever, STsdbSnapWriter** ppWriter);
 int32_t tsdbSnapWrite(STsdbSnapWriter* pWriter, uint8_t* pData, uint32_t nData);
+int32_t tsdbSnapWriterPrepareClose(STsdbSnapWriter* pWriter);
 int32_t tsdbSnapWriterClose(STsdbSnapWriter** ppWriter, int8_t rollback);
 // STqSnapshotReader ==
 int32_t tqSnapReaderOpen(STQ* pTq, int64_t sver, int64_t ever, STqSnapReader** ppReader);

source/dnode/vnode/src/tsdb/tsdbSnapshot.c

@@ -1376,27 +1376,34 @@ _exit:
   return code;
 }
 
-int32_t tsdbSnapWriterClose(STsdbSnapWriter** ppWriter, int8_t rollback) {
+int32_t tsdbSnapWriterPrepareClose(STsdbSnapWriter* pWriter) {
   int32_t code = 0;
-  STsdbSnapWriter* pWriter = *ppWriter;
-  STsdb*           pTsdb = pWriter->pTsdb;
-
-  if (rollback) {
-    ASSERT(0);
-    // code = tsdbFSRollback(pWriter->pTsdb->pFS);
-    // if (code) goto _err;
-  } else {
   if (pWriter->dWriter.pWriter) {
     code = tsdbSnapWriteCloseFile(pWriter);
-      if (code) goto _err;
+    if (code) goto _exit;
   }
 
   code = tsdbSnapWriteDelEnd(pWriter);
-    if (code) goto _err;
+  if (code) goto _exit;
 
   code = tsdbFSPrepareCommit(pWriter->pTsdb, &pWriter->fs);
-    if (code) goto _err;
+  if (code) goto _exit;
 
+_exit:
+  if (code) {
+    tsdbError("vgId:%d %s failed since %s", TD_VID(pWriter->pTsdb->pVnode), __func__, tstrerror(code));
+  }
+  return code;
+}
+
+int32_t tsdbSnapWriterClose(STsdbSnapWriter** ppWriter, int8_t rollback) {
+  int32_t          code = 0;
+  STsdbSnapWriter* pWriter = *ppWriter;
+  STsdb*           pTsdb = pWriter->pTsdb;
+
+  if (rollback) {
+    tsdbRollbackCommit(pWriter->pTsdb);
+  } else {
     // lock
     taosThreadRwlockWrlock(&pTsdb->rwLock);
 

source/dnode/vnode/src/vnd/vnodeSnapshot.c

@@ -331,6 +331,12 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *
   int32_t code = 0;
   SVnode *pVnode = pWriter->pVnode;
 
+  // prepare
+  if (pWriter->pTsdbSnapWriter) {
+    tsdbSnapWriterPrepareClose(pWriter->pTsdbSnapWriter);
+  }
+
+  // commit json
   if (!rollback) {
     pVnode->config = pWriter->info.config;
     pVnode->state = (SVState){.committed = pWriter->info.state.committed,
@@ -351,6 +357,7 @@ int32_t vnodeSnapWriterClose(SVSnapWriter *pWriter, int8_t rollback, SSnapshot *
     vnodeRollback(pWriter->pVnode);
   }
 
+  // commit/rollback sub-system
   if (pWriter->pMetaSnapWriter) {
     code = metaSnapWriterClose(&pWriter->pMetaSnapWriter, rollback);
     if (code) goto _exit;