diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 68e98757cc0ab54662ac7af6c587d08cd44ac6ce..6d2b0501630cb2b1801203327d8198a1795a4456 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -110,10 +110,11 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
 }
 
 static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  int code = TSDB_CODE_SUCCESS;
 
   STableCfg *pCfg = tsdbCreateTableCfgFromMsg((SMDCreateTableMsg *)pCont);
   if (pCfg == NULL) return terrno;
-  int32_t code = tsdbCreateTable(pVnode->tsdb, pCfg);
+  if (tsdbCreateTable(pVnode->tsdb, pCfg) < 0) code = terrno;
 
   tsdbClearTableCfg(pCfg);
   return code;
@@ -121,15 +122,12 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
 
 static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
   SMDDropTableMsg *pTable = pCont;
-  int32_t code = 0;
+  int32_t          code = TSDB_CODE_SUCCESS;
 
   vTrace("vgId:%d, table:%s, start to drop", pVnode->vgId, pTable->tableId);
-  STableId tableId = {
-    .uid = htobe64(pTable->uid),
-    .tid = htonl(pTable->sid)
-  };
+  STableId tableId = {.uid = htobe64(pTable->uid), .tid = htonl(pTable->sid)};
 
-  code = tsdbDropTable(pVnode->tsdb, tableId);
+  if (tsdbDropTable(pVnode->tsdb, tableId) < 0) code = terrno;
 
   return code;
 }
@@ -140,24 +138,24 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
 
 static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
   SMDDropSTableMsg *pTable = pCont;
-  int32_t code = 0;
+  int32_t           code = TSDB_CODE_SUCCESS;
 
   vTrace("vgId:%d, stable:%s, start to drop", pVnode->vgId, pTable->tableId);
-  
-  STableId stableId = {
-    .uid = htobe64(pTable->uid),
-    .tid = -1
-  };
 
-  code = tsdbDropTable(pVnode->tsdb, stableId);
-  
+  STableId stableId = {.uid = htobe64(pTable->uid), .tid = -1};
+
+  if (tsdbDropTable(pVnode->tsdb, stableId) < 0) code = terrno;
+
   vTrace("vgId:%d, stable:%s, drop stable result:%s", pVnode->vgId, pTable->tableId, tstrerror(code));
- 
+
   return code;
 }
 
 static int32_t vnodeProcessUpdateTagValMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
-  return tsdbUpdateTagValue(pVnode->tsdb, (SUpdateTableTagValMsg *)pCont);
+  if (tsdbUpdateTagValue(pVnode->tsdb, (SUpdateTableTagValMsg *)pCont) < 0) {
+    return terrno;
+  }
+  return TSDB_CODE_SUCCESS;
 }
 
 int vnodeWriteToQueue(void *param, void *data, int type) {