diff --git a/src/inc/twal.h b/src/inc/twal.h
index b85377d8d43521f4927b958d1839a9e565431c6a..8dd3a8a91209e840abeb9560f94a52ce362492a9 100644
--- a/src/inc/twal.h
+++ b/src/inc/twal.h
@@ -54,16 +54,17 @@ typedef int32_t FWalWrite(void *ahandle, void *pHead, int32_t qtype, void *pMsg)
 int32_t walInit();
 void    walCleanUp();
 
-twalh   walOpen(char *path, SWalCfg *pCfg);
-int32_t walAlter(twalh pWal, SWalCfg *pCfg);
-void    walStop(twalh);
-void    walClose(twalh);
-int32_t walRenew(twalh);
-void    walRemoveOldFiles(twalh);
-int32_t walWrite(twalh, SWalHead *);
-void    walFsync(twalh, bool forceFsync);
-int32_t walRestore(twalh, void *pVnode, FWalWrite writeFp);
-int32_t walGetWalFile(twalh, char *fileName, int64_t *fileId);
+twalh    walOpen(char *path, SWalCfg *pCfg);
+int32_t  walAlter(twalh pWal, SWalCfg *pCfg);
+void     walStop(twalh);
+void     walClose(twalh);
+int32_t  walRenew(twalh);
+void     walRemoveOneOldFile(twalh);
+void     walRemoveAllOldFiles(twalh);
+int32_t  walWrite(twalh, SWalHead *);
+void     walFsync(twalh, bool forceFsync);
+int32_t  walRestore(twalh, void *pVnode, FWalWrite writeFp);
+int32_t  walGetWalFile(twalh, char *fileName, int64_t *fileId);
 uint64_t walGetVersion(twalh);
 
 #ifdef __cplusplus
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 138455e1b57f6e0ef75cf5a8699ece864e9223d7..e1ea89a76aff44280e86569449fe818c20b4f393 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -318,6 +318,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   }
 
   tsdbSyncCommit(pVnode->tsdb);
+  walRemoveAllOldFiles(pVnode->tsdb);
   walRenew(pVnode->wal);
 
   SSyncInfo syncInfo;
@@ -593,7 +594,7 @@ static int vnodeProcessTsdbStatus(void *arg, int status) {
 
   if (status == TSDB_STATUS_COMMIT_OVER) {
     vDebug("vgId:%d, commit over, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, pVnode->fversion, pVnode->version);
-    walRemoveOldFiles(pVnode->wal);
+    walRemoveOneOldFile(pVnode->wal);
     return vnodeSaveVersion(pVnode);
   }
 
diff --git a/src/wal/src/walMgmt.c b/src/wal/src/walMgmt.c
index 9ba0dfd1240e56eec22c2f8a2eb42ec0326fc32c..fb49f38217d62b9181f0eed92155434b516ab3e0 100644
--- a/src/wal/src/walMgmt.c
+++ b/src/wal/src/walMgmt.c
@@ -128,16 +128,7 @@ void walClose(void *handle) {
   taosClose(pWal->fd);
 
   if (pWal->keep != TAOS_WAL_KEEP) {
-    int64_t fileId = -1;
-    while (walGetNextFile(pWal, &fileId) >= 0) {
-      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%" PRId64, pWal->path, WAL_PREFIX, fileId);
-
-      if (remove(pWal->name) < 0) {
-        wError("vgId:%d, wal:%p file:%s, failed to remove", pWal->vgId, pWal, pWal->name);
-      } else {
-        wInfo("vgId:%d, wal:%p file:%s, it is removed", pWal->vgId, pWal, pWal->name);
-      }
-    }
+    walRemoveAllOldFiles(pWal);
   } else {
     wDebug("vgId:%d, wal:%p file:%s, it is closed and kept", pWal->vgId, pWal, pWal->name);
   }
diff --git a/src/wal/src/walWrite.c b/src/wal/src/walWrite.c
index d3a41ec6b22883468625ef4a858f4d2f7d88a773..48021eecfc3523466f1e8e878cfb6b5344c8e9c4 100644
--- a/src/wal/src/walWrite.c
+++ b/src/wal/src/walWrite.c
@@ -63,7 +63,7 @@ int32_t walRenew(void *handle) {
   return code;
 }
 
-void walRemoveOldFiles(void *handle) {
+void walRemoveOneOldFile(void *handle) {
   SWal *pWal = handle;
   if (pWal == NULL) return;
   if (pWal->keep == TAOS_WAL_KEEP) return;
@@ -86,6 +86,22 @@ void walRemoveOldFiles(void *handle) {
   pthread_mutex_unlock(&pWal->mutex);
 }
 
+void walRemoveAllOldFiles(void *handle) {
+  if (handle == NULL) return;
+
+  SWal *  pWal = handle;
+  int64_t fileId = -1;
+  while (walGetNextFile(pWal, &fileId) >= 0) {
+    snprintf(pWal->name, sizeof(pWal->name), "%s/%s%" PRId64, pWal->path, WAL_PREFIX, fileId);
+
+    if (remove(pWal->name) < 0) {
+      wError("vgId:%d, wal:%p file:%s, failed to remove", pWal->vgId, pWal, pWal->name);
+    } else {
+      wInfo("vgId:%d, wal:%p file:%s, it is removed", pWal->vgId, pWal, pWal->name);
+    }
+  }
+}
+
 int32_t walWrite(void *handle, SWalHead *pHead) {
   if (handle == NULL) return -1;