From d5965c461a1bc0519fee465c438b7b3e078299ce Mon Sep 17 00:00:00 2001
From: tickduan <417921451@qq.com>
Date: Mon, 31 May 2021 15:51:43 +0800
Subject: [PATCH] must ltime >0 to replace

---
 src/client/src/tscStream.c  | 4 ++--
 tests/pytest/util/dnodes.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 2226c3d95d..3998f99afe 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -576,8 +576,8 @@ static void tscCreateStream(void *param, TAOS_RES *res, int code) {
   // set stime with ltime if ltime > stime
   const char* dstTable = pStream->dstTable? pStream->dstTable: "";
   tscDebug(" CQ table=%s ltime is %"PRId64, dstTable, pStream->ltime);
-  if(pStream->ltime > pStream->stime) {
-    tscWarn(" CQ set stream %s stime=%"PRId64" replace with ltime=%"PRId64"  ", dstTable, pStream->stime, pStream->ltime);
+  if(pStream->ltime > 0 && pStream->ltime > pStream->stime) {
+    tscWarn(" CQ set stream %s stime=%"PRId64" replace with ltime=%"PRId64" if ltime>0  ", dstTable, pStream->stime, pStream->ltime);
     pStream->stime = pStream->ltime;
   }
 
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 6eaf4e18af..0f71ffd0a3 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -432,7 +432,7 @@ class TDDnodes:
         self.simDeployed = False
 
     def init(self, path):
-        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        psCmd = "ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
         processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
             killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
@@ -545,14 +545,14 @@ class TDDnodes:
         for i in range(len(self.dnodes)):
             self.dnodes[i].stop()
 
-        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep| grep -v defunct | awk '{print $2}'"
         processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         if processID:
             cmd = "sudo systemctl stop taosd"
             os.system(cmd)
         # if os.system(cmd) != 0 :
         # tdLog.exit(cmd)
-        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        psCmd = "ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
         processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
             killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
-- 
GitLab