From 28fae393537c484985caa03cc973ce1786369dd7 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 8 Jan 2021 20:46:56 +0800
Subject: [PATCH] TD-2640 TD-2605

---
 src/vnode/inc/vnodeRead.h   | 2 +-
 src/vnode/inc/vnodeWrite.h  | 2 +-
 src/vnode/src/vnodeRead.c   | 7 ++++++-
 src/vnode/src/vnodeStatus.c | 6 ++++++
 src/vnode/src/vnodeWrite.c  | 7 ++++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/vnode/inc/vnodeRead.h b/src/vnode/inc/vnodeRead.h
index f5375d6ab0..0e9655f837 100644
--- a/src/vnode/inc/vnodeRead.h
+++ b/src/vnode/inc/vnodeRead.h
@@ -27,7 +27,7 @@ void    vnodeCleanupRead(void);
 int32_t vnodeWriteToRQueue(void *pVnode, void *pCont, int32_t contLen, int8_t qtype, void *rparam);
 void    vnodeFreeFromRQueue(void *pVnode, SVReadMsg *pRead);
 int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead);
-void    vnodeWaitReadCompleted(void *pVnode);
+void    vnodeWaitReadCompleted(SVnodeObj *pVnode);
 
 #ifdef __cplusplus
 }
diff --git a/src/vnode/inc/vnodeWrite.h b/src/vnode/inc/vnodeWrite.h
index 5238e45b81..e996bc0b06 100644
--- a/src/vnode/inc/vnodeWrite.h
+++ b/src/vnode/inc/vnodeWrite.h
@@ -27,7 +27,7 @@ void    vnodeCleanupWrite(void);
 int32_t vnodeWriteToWQueue(void *pVnode, void *pHead, int32_t qtype, void *pRpcMsg);
 void    vnodeFreeFromWQueue(void *pVnode, SVWriteMsg *pWrite);
 int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRet);
-void    vnodeWaitWriteCompleted(void *pVnode);
+void    vnodeWaitWriteCompleted(SVnodeObj *pVnode);
 
 #ifdef __cplusplus
 }
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index c864bc995b..41e631a24f 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -436,4 +436,9 @@ int32_t vnodeNotifyCurrentQhandle(void *handle, void *qhandle, int32_t vgId) {
   return rpcReportProgress(handle, (char *)pMsg, sizeof(SRetrieveTableMsg));
 }
 
-void vnodeWaitReadCompleted(void *pVnode) {}
\ No newline at end of file
+void vnodeWaitReadCompleted(SVnodeObj *pVnode) {
+  while (pVnode->queuedRMsg > 0) {
+    vTrace("vgId:%d, queued rmsg num:%d", pVnode->vgId, pVnode->queuedWMsg);
+    taosMsleep(10);
+  }
+}
\ No newline at end of file
diff --git a/src/vnode/src/vnodeStatus.c b/src/vnode/src/vnodeStatus.c
index c016b78396..11f79fb372 100644
--- a/src/vnode/src/vnodeStatus.c
+++ b/src/vnode/src/vnodeStatus.c
@@ -18,6 +18,8 @@
 #include "taosmsg.h"
 #include "query.h"
 #include "vnodeStatus.h"
+#include "vnodeRead.h"
+#include "vnodeWrite.h"
 
 char* vnodeStatus[] = {
   "init",
@@ -77,6 +79,8 @@ bool vnodeSetClosingStatus(SVnodeObj* pVnode) {
 
   // release local resources only after cutting off outside connections
   qQueryMgmtNotifyClosed(pVnode->qMgmt);
+  vnodeWaitReadCompleted(pVnode);
+  vnodeWaitWriteCompleted(pVnode);
 
   return true;
 }
@@ -121,6 +125,8 @@ bool vnodeSetResetStatus(SVnodeObj* pVnode) {
 
   // release local resources only after cutting off outside connections
   qQueryMgmtNotifyClosed(pVnode->qMgmt);
+  vnodeWaitReadCompleted(pVnode);
+  vnodeWaitWriteCompleted(pVnode);
 
   return true;
 }
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 5c2e871eb6..4f6ce9d2e4 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -345,4 +345,9 @@ static int32_t vnodePerformFlowCtrl(SVWriteMsg *pWrite) {
   }
 }
 
-void vnodeWaitWriteCompleted(void *pVnode) {}
\ No newline at end of file
+void vnodeWaitWriteCompleted(SVnodeObj *pVnode) {
+  while (pVnode->queuedWMsg > 0) {
+    vTrace("vgId:%d, queued wmsg num:%d", pVnode->vgId, pVnode->queuedWMsg);
+    taosMsleep(10);
+  }
+}
-- 
GitLab