more code

5649401a · Hongze Cheng · 3df96204 · 5649401a
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

source/dnode/vnode/src/tsdb/dev/tsdbMerge.c source/dnode/vnode/src/tsdb/dev/tsdbMerge.c +6 -1

未找到文件。
--- a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
+++ b/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
@@ -76,8 +76,13 @@ static int32_t tsdbMergerClose(SMerger *merger) {
  code = tsdbFSEditBegin(merger->tsdb->pFS, merger->fopArr, TSDB_FEDIT_MERGE);
  TSDB_CHECK_CODE(code, lino, _exit);

+  taosThreadRwlockWrlock(&merger->tsdb->rwLock);
  code = tsdbFSEditCommit(merger->tsdb->pFS);
-  TSDB_CHECK_CODE(code, lino, _exit);
+  if (code) {
+    taosThreadRwlockUnlock(&merger->tsdb->rwLock);
+    TSDB_CHECK_CODE(code, lino, _exit);
+  }
+  taosThreadRwlockUnlock(&merger->tsdb->rwLock);

  ASSERT(merger->dataWriter == NULL);
  ASSERT(merger->sttWriter == NULL);