From 5649401a65dcadd4a60834fb6c349d4691bc68d5 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 5 Jun 2023 09:22:20 +0800
Subject: [PATCH] more code

---
 source/dnode/vnode/src/tsdb/dev/tsdbMerge.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c b/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
index aefbfd345b..f2fef837eb 100644
--- 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);