From 4bb78df27c1f9db75c71552242cfd0cd2e8d15c6 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 27 Jun 2023 16:44:35 +0800
Subject: [PATCH] fix(stream): reduce the sleep time.

---
 source/dnode/vnode/src/tq/tq.c | 53 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 8ddf920985..677ce88457 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -156,6 +156,29 @@ void tqClose(STQ* pTq) {
   taosMemoryFree(pTq);
 }
 
+static bool hasStreamTaskInTimer(SStreamMeta* pMeta) {
+  bool inTimer = false;
+
+  taosWLockLatch(&pMeta->lock);
+
+  void* pIter = NULL;
+  while(1) {
+    pIter = taosHashIterate(pMeta->pTasks, pIter);
+    if (pIter == NULL) {
+      break;
+    }
+
+    SStreamTask* pTask = *(SStreamTask**)pIter;
+    if (pTask->status.timerActive == 1) {
+      inTimer = true;
+    }
+  }
+
+  taosWUnLockLatch(&pMeta->lock);
+
+  return inTimer;
+}
+
 void tqNotifyClose(STQ* pTq) {
   if (pTq != NULL) {
     taosWLockLatch(&pTq->pStreamMeta->lock);
@@ -183,38 +206,14 @@ void tqNotifyClose(STQ* pTq) {
     tqDebug("vgId:%d start to check all tasks", pTq->pStreamMeta->vgId);
 
     int64_t st = taosGetTimestampMs();
-    while(1) {
-      taosMsleep(1000);
 
-      bool inTimer = false;
-
-      taosWLockLatch(&pTq->pStreamMeta->lock);
-      pIter = NULL;
-
-      while(1) {
-        pIter = taosHashIterate(pTq->pStreamMeta->pTasks, pIter);
-        if (pIter == NULL) {
-          break;
-        }
-
-        SStreamTask* pTask = *(SStreamTask**)pIter;
-        if (pTask->status.timerActive == 1) {
-          inTimer = true;
-        }
-      }
-
-      taosWUnLockLatch(&pTq->pStreamMeta->lock);
-
-      if (inTimer) {
-        tqDebug("vgId:%d some tasks in timer, wait for 1sec and recheck", pTq->pStreamMeta->vgId);
-      } else {
-        break;
-      }
+    while(hasStreamTaskInTimer(pTq->pStreamMeta)) {
+      tqDebug("vgId:%d some tasks in timer, wait for 100ms and recheck", pTq->pStreamMeta->vgId);
+      taosMsleep(100);
     }
 
     int64_t el = taosGetTimestampMs() - st;
     tqDebug("vgId:%d all stream tasks are not in timer, continue close, elapsed time:%"PRId64" ms", pTq->pStreamMeta->vgId, el);
-
   }
 }
 
-- 
GitLab