From af036b877654ce59498c8ec033f0b307f7827840 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Mon, 25 Nov 2019 14:45:29 +0800
Subject: [PATCH] [TBASE-1235]

---
 src/system/detail/src/vnodeMeter.c | 4 +++-
 src/system/detail/src/vnodeShell.c | 4 +++-
 src/system/detail/src/vnodeStore.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c
index 4195138a29..f5619d72b8 100644
--- a/src/system/detail/src/vnodeMeter.c
+++ b/src/system/detail/src/vnodeMeter.c
@@ -24,6 +24,7 @@
 #include "vnodeMgmt.h"
 #include "vnodeShell.h"
 #include "vnodeUtil.h"
+#include "tstatus.h"
 
 #pragma GCC diagnostic ignored "-Wpointer-sign"
 
@@ -717,7 +718,8 @@ void vnodeUpdateMeter(void *param, void *tmrId) {
   SVnodeObj* pVnode = &vnodeList[pNew->vnode];
 
   if (pVnode->meterList == NULL) {
-    dTrace("vid:%d sid:%d id:%s, vnode is deleted, abort update schema", pNew->vnode, pNew->sid, pNew->meterId);
+    dTrace("vid:%d sid:%d id:%s, vnode is deleted, status:%s, abort update schema",
+            pNew->vnode, pNew->sid, pNew->meterId, taosGetVnodeStatusStr(vnodeList[pNew->vnode].vnodeStatus));
     free(pNew->schema);
     free(pNew);
     return;
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
index c0d149b0d1..91e6c9527b 100644
--- a/src/system/detail/src/vnodeShell.c
+++ b/src/system/detail/src/vnodeShell.c
@@ -184,13 +184,15 @@ int vnodeOpenShellVnode(int vnode) {
 
 static void vnodeDelayedFreeResource(void *param, void *tmrId) {
   int32_t vnode = *(int32_t*) param;
-  dTrace("vid:%d, start to free resources", vnode);
+  dTrace("vid:%d, start to free resources for 500ms arrived", vnode);
 
   taosCloseRpcChann(pShellServer, vnode); // close connection
   tfree(shellList[vnode]);  //free SShellObj
   tfree(param);
 
   memset(vnodeList + vnode, 0, sizeof(SVnodeObj));
+  dTrace("vid:%d, status set to %s", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
+
   vnodeCalcOpenVnodes();
 }
 
diff --git a/src/system/detail/src/vnodeStore.c b/src/system/detail/src/vnodeStore.c
index e49a84ed5b..fb18f01214 100644
--- a/src/system/detail/src/vnodeStore.c
+++ b/src/system/detail/src/vnodeStore.c
@@ -250,7 +250,7 @@ static void vnodeRemoveDataFiles(int vnode) {
 
   sprintf(vnodeDir, "%s/vnode%d", tsDirectory, vnode);
   rmdir(vnodeDir);
-  dPrint("vid:%d, vnode is removed!", vnode);
+  dPrint("vid:%d, vnode is removed, status:%s", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
 }
 
 int vnodeRemoveVnode(int vnode) {
-- 
GitLab