diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index a974eb27bf..dc76aa61b2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -435,7 +435,7 @@ _exit:
     tsdbDebug("vgId:%d %s done, fid:%d minKey:%" PRId64 " maxKey:%" PRId64 " expLevel:%d", TD_VID(tsdb->pVnode),
               __func__, committer->ctx->fid, committer->ctx->minKey, committer->ctx->maxKey, committer->ctx->expLevel);
   }
-  return 0;
+  return code;
 }
 
 static int32_t tsdbCommitFileSetEnd(SCommitter2 *committer) {
diff --git a/source/dnode/vnode/src/vnd/vnodeAsync.c b/source/dnode/vnode/src/vnd/vnodeAsync.c
index c95d2324aa..c6bf60fa76 100644
--- a/source/dnode/vnode/src/vnd/vnodeAsync.c
+++ b/source/dnode/vnode/src/vnd/vnodeAsync.c
@@ -177,12 +177,15 @@ static int32_t vnodeAsyncTaskDone(SVAsync *async, SVATask *task) {
 }
 
 static int32_t vnodeAsyncCancelAllTasks(SVAsync *async) {
-  for (int32_t i = 0; i < EVA_PRIORITY_MAX; i++) {
-    while (async->queue[i].next != &async->queue[i]) {
-      SVATask *task = async->queue[i].next;
-      task->prev->next = task->next;
-      task->next->prev = task->prev;
-      vnodeAsyncTaskDone(async, task);
+  while (async->queue[0].next != &async->queue[0] || async->queue[1].next != &async->queue[1] ||
+         async->queue[2].next != &async->queue[2]) {
+    for (int32_t i = 0; i < EVA_PRIORITY_MAX; i++) {
+      while (async->queue[i].next != &async->queue[i]) {
+        SVATask *task = async->queue[i].next;
+        task->prev->next = task->next;
+        task->next->prev = task->prev;
+        vnodeAsyncTaskDone(async, task);
+      }
     }
   }
   return 0;