diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 1919747a0b019239e5d6b717921c6a957728d455..7d13e16c464ebfed12f4ad4aaede4ac21c6db43c 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -201,6 +201,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR,      0, 0x0507, "Missing da
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_OUT_OF_MEMORY,            0, 0x0508, "Out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_APP_ERROR,                0, 0x0509, "Unexpected generic error in vnode")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_INVALID_VRESION_FILE,     0, 0x050A, "Invalid version file")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_FULL,                  0, 0x050B, "Vnode memory is full for commit is failed")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_NOT_SYNCED,               0, 0x0511, "Database suspended")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_WRITE_AUTH,            0, 0x0512, "Write operation denied")
 
diff --git a/src/vnode/inc/vnodeInt.h b/src/vnode/inc/vnodeInt.h
index 9f1c98774bd9fdd0cfa5abda3d4a2f430a08bf78..0f06af390ca37189bb9dfc2ec88e2b4107630692 100644
--- a/src/vnode/inc/vnodeInt.h
+++ b/src/vnode/inc/vnodeInt.h
@@ -41,6 +41,7 @@ typedef struct {
   int8_t       status; 
   int8_t       role;   
   int8_t       accessState;
+  int8_t       isFull;
   uint64_t     version;   // current version 
   uint64_t     fversion;  // version on saved data file
   void        *wqueue;
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 7922476898401f99a292431748e83463297e3f89..26b3b7233ce27afb526e1915fea44cb1c12c627b 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -381,6 +381,7 @@ int32_t vnodeClose(int32_t vgId) {
 void vnodeRelease(void *pVnodeRaw) {
   if (pVnodeRaw == NULL) return;
   SVnodeObj *pVnode = pVnodeRaw;
+  int32_t    code = 0;
   int32_t    vgId = pVnode->vgId;
 
   int32_t refCount = atomic_sub_fetch_32(&pVnode->refCount, 1);
@@ -406,7 +407,7 @@ void vnodeRelease(void *pVnodeRaw) {
   }
 
   if (pVnode->tsdb) {
-    tsdbCloseRepo(pVnode->tsdb, 1);
+    code = tsdbCloseRepo(pVnode->tsdb, 1);
     pVnode->tsdb = NULL;
   }
 
@@ -418,7 +419,7 @@ void vnodeRelease(void *pVnodeRaw) {
   }
 
   if (pVnode->wal) {
-    walRemoveAllOldFiles(pVnode->wal);
+    if (code == 0) walRemoveAllOldFiles(pVnode->wal);
     walClose(pVnode->wal);
     pVnode->wal = NULL;
   }
@@ -594,7 +595,10 @@ static int vnodeProcessTsdbStatus(void *arg, int status, int eno) {
   SVnodeObj *pVnode = arg;
 
   if (eno != TSDB_CODE_SUCCESS) {
-    // TODO: deal with the error here
+    vError("vgId:%d, failed to commit since %s, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, tstrerror(eno),
+           pVnode->fversion, pVnode->version);
+    pVnode->isFull = 1;
+    return 0;
   }
 
   if (status == TSDB_STATUS_COMMIT_START) {
@@ -609,6 +613,7 @@ static int vnodeProcessTsdbStatus(void *arg, int status, int eno) {
 
   if (status == TSDB_STATUS_COMMIT_OVER) {
     vDebug("vgId:%d, commit over, fver:%" PRIu64 " vver:%" PRIu64, pVnode->vgId, pVnode->fversion, pVnode->version);
+    pVnode->isFull = 0;
     walRemoveOneOldFile(pVnode->wal);
     return vnodeSaveVersion(pVnode);
   }
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 80da91602b13c4677020196532524188f34e0617..ea7eb94efe81b60761f81e237c5de114b3236977 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -119,6 +119,11 @@ static int32_t vnodeCheckWrite(void *param) {
     return TSDB_CODE_APP_NOT_READY;
   }
 
+  if (pVnode->isFull) {
+    vDebug("vgId:%d, vnode is full, refCount:%d", pVnode->vgId, pVnode->refCount);
+    return TSDB_CODE_VND_IS_FULL;
+  }
+
   return TSDB_CODE_SUCCESS;
 }