From c7518e0913b33820b173f542a8548f5e3f1a1921 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 12:26:01 +0800
Subject: [PATCH 01/10] dnodes.py split dnode.py simClient.py

---
 tests/army/community/cmdline/taosd.py |  69 +++
 tests/army/frame/caseBase.py          |   5 +
 tests/army/frame/eos.py               |  10 +-
 tests/army/frame/etool.py             |   9 +
 tests/army/frame/server/dnode.py      | 591 +++++++++++++++++++++++
 tests/army/frame/server/dnodes.py     | 656 +-------------------------
 tests/army/frame/server/simClient.py  | 116 +++++
 tests/army/frame/srvCtl.py            |   9 +
 8 files changed, 812 insertions(+), 653 deletions(-)
 create mode 100644 tests/army/community/cmdline/taosd.py
 create mode 100644 tests/army/frame/server/dnode.py
 create mode 100644 tests/army/frame/server/simClient.py

diff --git a/tests/army/community/cmdline/taosd.py b/tests/army/community/cmdline/taosd.py
new file mode 100644
index 0000000000..c361732dca
--- /dev/null
+++ b/tests/army/community/cmdline/taosd.py
@@ -0,0 +1,69 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import random
+
+import taos
+import frame
+
+from frame.log import *
+from frame.sql import *
+from frame.cases import *
+from frame.caseBase import *
+from frame.srvCtl import *
+from frame import *
+
+
+class TDTestCase(TBase):
+    def insertData(self):
+        tdLog.info(f"insert data.")
+
+        tdSql.execute(f"use {self.db}")
+        # set insert data information
+        self.childtable_count = 10
+        self.insert_rows      = 10000
+        self.timestamp_step   = 1000
+
+        # taosBenchmark run
+        etool.runBenchmark(command = f"-d {self.db} -t {self.childtable_count} -n {self.insert_rows} -y")
+        
+
+    def doAction(self):
+        tdLog.info(f"do action.")
+        
+        # dump out sdb
+        sdb = epath.binFile("sdb.json")
+        eos.delFile(sdb)
+
+        cfg = sc.dnodeCfgPath(1)
+        etool.runBinFile("taosd", f"-s -c {cfg}")
+        self.checkFileExist(sdb)
+        
+
+    # run
+    def run(self):
+        tdLog.debug(f"start to excute {__file__}")
+
+        # insert data
+        self.insertData()
+
+        # do action
+        self.doAction()
+
+        tdLog.success(f"{__file__} successfully executed")
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py
index 8d2c1e6d18..535b7aeeb4 100644
--- a/tests/army/frame/caseBase.py
+++ b/tests/army/frame/caseBase.py
@@ -188,3 +188,8 @@ class TBase:
             time.sleep(interval)
         
         return False    
+
+     # check file exist
+    def checkFileExist(self, pathFile):
+        if os.path.exists(pathFile) == False:
+            tdLog.exit(f"file not exist {pathFile}")
\ No newline at end of file
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index 1c00f94380..d0b37d1d10 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -73,6 +73,14 @@ def run(command):
 
 # return list after run
 def runRetList(command):
-    lines = []
     output,error = run(command)
     return output.splitlines()
+
+
+
+#
+#   file 
+#
+
+def delFile(file):
+    return exe(f"rm -rf {file}")
\ No newline at end of file
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index 35c390dc1a..d0c51ca39e 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -44,3 +44,12 @@ def runBenchmark(command = "", json = "") :
 # get current directory file name
 def curFile(fullPath, filename):
     return os.path.dirname(fullPath) + "/" + filename
+
+
+# run build/bin file
+def runBinFile(fname, command):
+    binFile = frame.epath.binFile(fname)
+    if frame.eos.isWin():
+        binFile += ".exe"
+
+    frame.eos.runRetList(f"{binFile} {command}")
\ No newline at end of file
diff --git a/tests/army/frame/server/dnode.py b/tests/army/frame/server/dnode.py
new file mode 100644
index 0000000000..6331939636
--- /dev/null
+++ b/tests/army/frame/server/dnode.py
@@ -0,0 +1,591 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import platform
+import distro
+import subprocess
+from time import sleep
+import base64
+import json
+import copy
+from fabric2 import Connection
+from shutil import which
+
+# self
+from frame.log import *
+
+
+class TDDnode:
+    def __init__(self, index=1, level=1, disk=1):
+        self.index = index
+        self.level = level
+        self.disk  = disk
+        self.dataDir = []
+        self.running = 0
+        self.deployed = 0
+        self.testCluster = False
+        self.valgrind = 0
+        self.asan = False
+        self.remoteIP = ""
+        self.cfgDict = {
+            "fqdn": "localhost",
+            "monitor": "0",
+            "maxShellConns": "30000",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "mDebugFlag": "143",
+            "dDebugFlag": "143",
+            "vDebugFlag": "143",
+            "tqDebugFlag": "143",
+            "cDebugFlag": "143",
+            "stDebugFlag": "143",
+            "smaDebugFlag": "143",
+            "jniDebugFlag": "143",
+            "qDebugFlag": "143",
+            "rpcDebugFlag": "143",
+            "tmrDebugFlag": "131",
+            "uDebugFlag": "135",
+            "sDebugFlag": "135",
+            "wDebugFlag": "135",
+            "numOfLogLines": "100000000",
+            "statusInterval": "1",
+            "enableQueryHb": "1",
+            "supportVnodes": "1024",
+            "telemetryReporting": "0"
+        }
+
+    def init(self, path, remoteIP = ""):
+        self.path = path
+        self.remoteIP = remoteIP
+        if (not self.remoteIP == ""):
+            try:
+                self.config = eval(self.remoteIP)
+                self.remote_conn = Connection(host=self.config["host"], port=self.config["port"], user=self.config["user"], connect_kwargs={'password':self.config["password"]})
+            except Exception as r:
+                print(r)
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def setAsan(self, value):
+        self.asan = value
+        if value:
+            selfPath = os.path.dirname(os.path.realpath(__file__))
+            if ("community" in selfPath):
+                self.execPath = os.path.abspath(self.path + "/community/tests/script/sh/exec.sh")
+            else:
+                self.execPath = os.path.abspath(self.path + "/tests/script/sh/exec.sh")
+
+    def getDataSize(self):
+        totalSize = 0
+
+        if (self.deployed == 1):
+            for dirpath, dirnames, filenames in os.walk(self.dataDir):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+
+                    if not os.path.islink(fp):
+                        totalSize = totalSize + os.path.getsize(fp)
+
+        return totalSize
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def remoteExec(self, updateCfgDict, execCmd):
+        valgrindStr = ''
+        if (self.valgrind==1):
+            valgrindStr = '-g'
+        remoteCfgDict = copy.deepcopy(updateCfgDict)
+        if ("logDir" in remoteCfgDict):
+            del remoteCfgDict["logDir"]
+        if ("dataDir" in remoteCfgDict):
+            del remoteCfgDict["dataDir"]
+        if ("cfgDir" in remoteCfgDict):
+            del remoteCfgDict["cfgDir"]
+        remoteCfgDictStr = base64.b64encode(json.dumps(remoteCfgDict).encode()).decode()
+        execCmdStr = base64.b64encode(execCmd.encode()).decode()
+        with self.remote_conn.cd((self.config["path"]+sys.path[0].replace(self.path, '')).replace('\\','/')):
+            self.remote_conn.run("python3 ./test.py %s -d %s -e %s"%(valgrindStr,remoteCfgDictStr,execCmdStr))
+
+    def deploy(self, *updatecfgDict):
+        # logDir
+        self.logDir = os.path.join(self.path,"sim","dnode%d" % self.index, "log")
+        # dataDir
+        simPath = os.path.join(self.path, "sim", "dnode%d" % self.index)
+        primary = 1
+        if self.level == 1 and self.disk == 1:
+            eDir = os.path.join(simPath, "data")
+            self.dataDir.append(eDir)
+        else:     
+            for i in range(self.level):
+                for j in range(self.disk):
+                    eDir = os.path.join(simPath, f"data{i}{j}")
+                    self.dataDir.append(f"{eDir} {i} {primary}")
+                    if primary == 1:
+                        primary = 0
+
+        # taos.cfg
+        self.cfgDir  = os.path.join(self.path,"sim","dnode%d" % self.index, "cfg")
+        self.cfgPath = os.path.join(self.cfgDir, "taos.cfg")
+        
+        for eDir in self.dataDir:
+            cmd = "rm -rf " + eDir
+            if os.system(cmd) != 0:
+                tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        # cmd = "mkdir -p " + self.dataDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        for eDir in self.dataDir:
+             os.makedirs(eDir.split(' ')[0])
+
+        # cmd = "mkdir -p " + self.logDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.logDir)
+
+        # cmd = "mkdir -p " + self.cfgDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.cfgDir)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.startIP()
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        self.cfgDict["dataDir"] = self.dataDir
+        self.cfgDict["logDir"] = self.logDir
+        # self.cfg("dataDir",self.dataDir)
+        # self.cfg("logDir",self.logDir)
+        # print(updatecfgDict)
+        isFirstDir = 1
+        if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
+            for key, value in updatecfgDict[0][0].items():
+                if key == "clientCfg" and self.remoteIP == "" and not platform.system().lower() == 'windows':
+                    continue
+                if value == 'dataDir':
+                    if isFirstDir:
+                        self.cfgDict.pop('dataDir')
+                        self.cfg(value, key)
+                        isFirstDir = 0
+                    else:
+                        self.cfg(value, key)
+                else:
+                    self.addExtraCfg(key, value)
+        if (self.remoteIP == ""):
+            for key, value in self.cfgDict.items():
+                if type(value) == list:
+                    for v in value:
+                        self.cfg(key, v)
+                else:
+                    self.cfg(key, value)
+        else:
+            self.remoteExec(self.cfgDict, "tdDnodes.deploy(%d,updateCfgDict)"%self.index)
+
+        self.deployed = 1
+        tdLog.debug(
+            "dnode:%d is deployed and configured by %s" %
+            (self.index, self.cfgPath))
+
+    def getPath(self, tool="taosd"):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        paths = []
+        for root, dirs, files in os.walk(projPath):
+            if ((tool) in files or ("%s.exe"%tool) in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    paths.append(os.path.join(root, tool))
+                    break
+        if (len(paths) == 0):
+                return ""
+        return paths[0]
+
+    def starttaosd(self):
+        binPath = self.getPath()
+
+        if (binPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found: %s" % binPath)
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s -c %s" % (
+                    binPath, self.cfgDir)
+            else:
+                if self.asan:
+                    asanDir = "%s/sim/asan/dnode%d.asan" % (
+                        self.path, self.index)
+                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
+                        binPath, self.cfgDir, asanDir)
+                else:
+                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                        binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
+
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s %s -c %s" % (
+                    valgrindCmdline, binPath, self.cfgDir)
+            else:
+                cmd = "nohup %s %s -c %s 2>&1 & " % (
+                    valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if (not self.remoteIP == ""):
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.start(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
+            self.running = 1
+        else:
+            if os.system(cmd) != 0:
+                tdLog.exit(cmd)
+            self.running = 1
+            tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+            if self.valgrind == 0:
+                time.sleep(0.1)
+                key1 = 'from offline to online'
+                bkey1 = bytes(key1, encoding="utf8")
+                key2= 'TDengine initialized successfully'
+                bkey2 = bytes(key2, encoding="utf8")
+                logFile = self.logDir + "/taosdlog.0"
+                i = 0
+                # while not os.path.exists(logFile):
+                #     sleep(0.1)
+                #     i += 1
+                #     if i > 10:
+                #         break
+                # tailCmdStr = 'tail -f '
+                # if platform.system().lower() == 'windows':
+                #     tailCmdStr = 'tail -n +0 -f '
+                # popen = subprocess.Popen(
+                #     tailCmdStr + logFile,
+                #     stdout=subprocess.PIPE,
+                #     stderr=subprocess.PIPE,
+                #     shell=True)
+                # pid = popen.pid
+                # # print('Popen.pid:' + str(pid))
+                # timeout = time.time() + 60 * 2
+                # while True:
+                #     line = popen.stdout.readline().strip()
+                #     print(line)
+                #     if bkey1 in line:
+                #         popen.kill()
+                #         break
+                #     elif bkey2 in line:
+                #         popen.kill()
+                #         break
+                #     if time.time() > timeout:
+                #         print(time.time(),timeout)
+                #         tdLog.exit('wait too long for taosd start')
+                tdLog.debug("the dnode:%d has been started." % (self.index))
+            else:
+                tdLog.debug(
+                    "wait 10 seconds for the dnode:%d to start." %
+                    (self.index))
+                time.sleep(10)
+
+    def start(self):
+        binPath = self.getPath()
+
+        if (binPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found: %s" % binPath)
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s -c %s" % (
+                    binPath, self.cfgDir)
+            else:
+                if self.asan:
+                    asanDir = "%s/sim/asan/dnode%d.asan" % (
+                        self.path, self.index)
+                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
+                        binPath, self.cfgDir, asanDir)
+                else:
+                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                        binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
+
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s %s -c %s" % (
+                    valgrindCmdline, binPath, self.cfgDir)
+            else:
+                cmd = "nohup %s %s -c %s 2>&1 & " % (
+                    valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if (not self.remoteIP == ""):
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.start(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
+            self.running = 1
+        else:
+            os.system("rm -rf %s/taosdlog.0"%self.logDir)
+            if os.system(cmd) != 0:
+                tdLog.exit(cmd)
+            self.running = 1
+            tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+            if self.valgrind == 0:
+                time.sleep(0.1)
+                key = 'from offline to online'
+                bkey = bytes(key, encoding="utf8")
+                logFile = self.logDir + "/taosdlog.0"
+                i = 0
+                while not os.path.exists(logFile):
+                    sleep(0.1)
+                    i += 1
+                    if i > 50:
+                        break
+                with open(logFile) as f:
+                    timeout = time.time() + 10 * 2
+                    while True:
+                        line = f.readline().encode('utf-8')
+                        if bkey in line:
+                            break
+                        if time.time() > timeout:
+                            tdLog.exit('wait too long for taosd start')
+                    tdLog.debug("the dnode:%d has been started." % (self.index))
+            else:
+                tdLog.debug(
+                    "wait 10 seconds for the dnode:%d to start." %
+                    (self.index))
+                time.sleep(10)
+
+    def startWithoutSleep(self):
+        binPath = self.getPath()
+
+        if (binPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found: %s" % binPath)
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s -c %s" % (binPath, self.cfgDir)
+            else:
+                if self.asan:
+                    asanDir = "%s/sim/asan/dnode%d.asan" % (
+                        self.path, self.index)
+                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
+                        binPath, self.cfgDir, asanDir)
+                else:
+                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                        binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind  --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
+            if platform.system().lower() == 'windows':
+                cmd = "mintty -h never %s %s -c %s" % (
+                    valgrindCmdline, binPath, self.cfgDir)
+            else:
+                cmd = "nohup %s %s -c %s 2>&1 & " % (
+                    valgrindCmdline, binPath, self.cfgDir)
+            print(cmd)
+
+        if (self.remoteIP == ""):
+            if os.system(cmd) != 0:
+                tdLog.exit(cmd)
+        else:
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.startWithoutSleep(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
+
+        self.running = 1
+        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+
+    def stop(self):
+        if self.asan:
+            stopCmd = "%s -s stop -n dnode%d" % (self.execPath, self.index)
+            tdLog.info("execute script: " + stopCmd)
+            os.system(stopCmd)
+            return
+
+        if (not self.remoteIP == ""):
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].stop()"%(self.index-1,self.index-1))
+            tdLog.info("stop dnode%d"%self.index)
+            return
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8").strip()
+
+            onlyKillOnceWindows = 0
+            while(processID):
+                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
+                    killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                    if platform.system().lower() == 'windows':
+                        killCmd = "kill -INT %s > nul 2>&1" % processID
+                    os.system(killCmd)
+                    onlyKillOnceWindows = 1
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8").strip()
+            if not platform.system().lower() == 'windows':
+                for port in range(6030, 6041):
+                    fuserCmd = "fuser -k -n tcp %d > /dev/null" % port
+                    os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+
+    def stoptaosd(self):
+        tdLog.debug("start to stop taosd on dnode: %d "% (self.index))
+        # print(self.asan,self.running,self.remoteIP,self.valgrind)
+        if self.asan:
+            stopCmd = "%s -s stop -n dnode%d" % (self.execPath, self.index)
+            tdLog.info("execute script: " + stopCmd)
+            os.system(stopCmd)
+            return
+
+        if (not self.remoteIP == ""):
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].stop()"%(self.index-1,self.index-1))
+            tdLog.info("stop dnode%d"%self.index)
+            return
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            if platform.system().lower() == 'windows':
+                psCmd = "for /f %%a in ('wmic process where \"name='taosd.exe' and CommandLine like '%%dnode%d%%'\" get processId ^| xargs echo ^| awk ^'{print $2}^' ^&^& echo aa') do @(ps | grep %%a | awk '{print $1}' | xargs)" % (self.index)
+            else:
+                psCmd = "ps -ef|grep -w %s| grep dnode%d|grep -v grep | awk '{print $2}' | xargs" % (toBeKilled,self.index)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8").strip()
+
+            onlyKillOnceWindows = 0
+            while(processID):
+                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
+                    killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                    if platform.system().lower() == 'windows':
+                        killCmd = "kill -INT %s > nul 2>&1" % processID
+                    os.system(killCmd)
+                    onlyKillOnceWindows = 1
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8").strip()
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+    def forcestop(self):
+        if self.asan:
+            stopCmd = "%s -s stop -n dnode%d -x SIGKILL" + \
+                (self.execPath, self.index)
+            tdLog.info("execute script: " + stopCmd)
+            os.system(stopCmd)
+            return
+
+        if (not self.remoteIP == ""):
+            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].forcestop()"%(self.index-1,self.index-1))
+            return
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8").strip()
+
+            onlyKillOnceWindows = 0
+            while(processID):
+                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
+                    killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
+                    os.system(killCmd)
+                    onlyKillOnceWindows = 1
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8").strip()
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
+
+    def startIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def stopIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
+            self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def cfg(self, option, value):
+        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def getDnodeRootDir(self, index):
+        dnodeRootDir = os.path.join(self.path,"sim","psim","dnode%d" % index)
+        return dnodeRootDir
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = os.path.join(self.path,"sim","psim")
+        return dnodesRootDir
\ No newline at end of file
diff --git a/tests/army/frame/server/dnodes.py b/tests/army/frame/server/dnodes.py
index 0d40b665dd..a22e1cbff7 100644
--- a/tests/army/frame/server/dnodes.py
+++ b/tests/army/frame/server/dnodes.py
@@ -22,660 +22,12 @@ import base64
 import json
 import copy
 from fabric2 import Connection
-from frame.log import *
 from shutil import which
 
-
-class TDSimClient:
-    def __init__(self, path):
-        self.testCluster = False
-        self.path = path
-        self.cfgDict = {
-            "fqdn": "localhost",
-            "numOfLogLines": "100000000",
-            "locale": "en_US.UTF-8",
-            "charset": "UTF-8",
-            "asyncLog": "0",
-            "rpcDebugFlag": "135",
-            "tmrDebugFlag": "131",
-            "cDebugFlag": "135",
-            "uDebugFlag": "135",
-            "jniDebugFlag": "135",
-            "qDebugFlag": "135",
-            "supportVnodes": "1024",
-            "enableQueryHb": "1",
-            "telemetryReporting": "0",
-            "tqDebugflag": "135",
-            "wDebugflag":"135",
-        }
-
-    def getLogDir(self):
-        self.logDir = os.path.join(self.path,"sim","psim","log")
-        return self.logDir
-
-    def getCfgDir(self):
-        self.cfgDir = os.path.join(self.path,"sim","psim","cfg")
-        return self.cfgDir
-
-    def setTestCluster(self, value):
-        self.testCluster = value
-
-    def addExtraCfg(self, option, value):
-        self.cfgDict.update({option: value})
-
-    def cfg(self, option, value):
-        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-    def deploy(self, *updatecfgDict):
-        self.logDir = os.path.join(self.path,"sim","psim","log")
-        self.cfgDir = os.path.join(self.path,"sim","psim","cfg")
-        self.cfgPath = os.path.join(self.path,"sim","psim","cfg","taos.cfg")
-
-        cmd = "rm -rf " + self.logDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        # cmd = "mkdir -p " + self.logDir
-        # if os.system(cmd) != 0:
-        #     tdLog.exit(cmd)
-        os.makedirs(self.logDir)
-
-        cmd = "rm -rf " + self.cfgDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        # cmd = "mkdir -p " + self.cfgDir
-        # if os.system(cmd) != 0:
-        #     tdLog.exit(cmd)
-        os.makedirs(self.cfgDir)
-
-        cmd = "touch " + self.cfgPath
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        if self.testCluster:
-            self.cfg("masterIp", "192.168.0.1")
-            self.cfg("secondIp", "192.168.0.2")
-        self.cfg("logDir", self.logDir)
-
-        for key, value in self.cfgDict.items():
-            self.cfg(key, value)
-
-        try:
-            if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
-                clientCfg = dict (updatecfgDict[0][0].get('clientCfg'))
-                for key, value in clientCfg.items():
-                    self.cfg(key, value)
-        except Exception:
-            pass
-
-        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
-
-
-class TDDnode:
-    def __init__(self, index=1, level=1, disk=1):
-        self.index = index
-        self.level = level
-        self.disk  = disk
-        self.dataDir = []
-        self.running = 0
-        self.deployed = 0
-        self.testCluster = False
-        self.valgrind = 0
-        self.asan = False
-        self.remoteIP = ""
-        self.cfgDict = {
-            "fqdn": "localhost",
-            "monitor": "0",
-            "maxShellConns": "30000",
-            "locale": "en_US.UTF-8",
-            "charset": "UTF-8",
-            "asyncLog": "0",
-            "mDebugFlag": "143",
-            "dDebugFlag": "143",
-            "vDebugFlag": "143",
-            "tqDebugFlag": "143",
-            "cDebugFlag": "143",
-            "stDebugFlag": "143",
-            "smaDebugFlag": "143",
-            "jniDebugFlag": "143",
-            "qDebugFlag": "143",
-            "rpcDebugFlag": "143",
-            "tmrDebugFlag": "131",
-            "uDebugFlag": "135",
-            "sDebugFlag": "135",
-            "wDebugFlag": "135",
-            "numOfLogLines": "100000000",
-            "statusInterval": "1",
-            "enableQueryHb": "1",
-            "supportVnodes": "1024",
-            "telemetryReporting": "0"
-        }
-
-    def init(self, path, remoteIP = ""):
-        self.path = path
-        self.remoteIP = remoteIP
-        if (not self.remoteIP == ""):
-            try:
-                self.config = eval(self.remoteIP)
-                self.remote_conn = Connection(host=self.config["host"], port=self.config["port"], user=self.config["user"], connect_kwargs={'password':self.config["password"]})
-            except Exception as r:
-                print(r)
-
-    def setTestCluster(self, value):
-        self.testCluster = value
-
-    def setValgrind(self, value):
-        self.valgrind = value
-
-    def setAsan(self, value):
-        self.asan = value
-        if value:
-            selfPath = os.path.dirname(os.path.realpath(__file__))
-            if ("community" in selfPath):
-                self.execPath = os.path.abspath(self.path + "/community/tests/script/sh/exec.sh")
-            else:
-                self.execPath = os.path.abspath(self.path + "/tests/script/sh/exec.sh")
-
-    def getDataSize(self):
-        totalSize = 0
-
-        if (self.deployed == 1):
-            for dirpath, dirnames, filenames in os.walk(self.dataDir):
-                for f in filenames:
-                    fp = os.path.join(dirpath, f)
-
-                    if not os.path.islink(fp):
-                        totalSize = totalSize + os.path.getsize(fp)
-
-        return totalSize
-
-    def addExtraCfg(self, option, value):
-        self.cfgDict.update({option: value})
-
-    def remoteExec(self, updateCfgDict, execCmd):
-        valgrindStr = ''
-        if (self.valgrind==1):
-            valgrindStr = '-g'
-        remoteCfgDict = copy.deepcopy(updateCfgDict)
-        if ("logDir" in remoteCfgDict):
-            del remoteCfgDict["logDir"]
-        if ("dataDir" in remoteCfgDict):
-            del remoteCfgDict["dataDir"]
-        if ("cfgDir" in remoteCfgDict):
-            del remoteCfgDict["cfgDir"]
-        remoteCfgDictStr = base64.b64encode(json.dumps(remoteCfgDict).encode()).decode()
-        execCmdStr = base64.b64encode(execCmd.encode()).decode()
-        with self.remote_conn.cd((self.config["path"]+sys.path[0].replace(self.path, '')).replace('\\','/')):
-            self.remote_conn.run("python3 ./test.py %s -d %s -e %s"%(valgrindStr,remoteCfgDictStr,execCmdStr))
-
-    def deploy(self, *updatecfgDict):
-        # logDir
-        self.logDir = os.path.join(self.path,"sim","dnode%d" % self.index, "log")
-        # dataDir
-        simPath = os.path.join(self.path, "sim", "dnode%d" % self.index)
-        primary = 1
-        if self.level == 1 and self.disk == 1:
-            eDir = os.path.join(simPath, "data")
-            self.dataDir.append(eDir)
-        else:     
-            for i in range(self.level):
-                for j in range(self.disk):
-                    eDir = os.path.join(simPath, f"data{i}{j}")
-                    self.dataDir.append(f"{eDir} {i} {primary}")
-                    if primary == 1:
-                        primary = 0
-
-        # taos.cfg
-        self.cfgDir = os.path.join(self.path,"sim","dnode%d" % self.index, "cfg")
-        self.cfgPath = os.path.join(self.path,"sim","dnode%d" % self.index, "cfg","taos.cfg")
-        
-        for eDir in self.dataDir:
-            cmd = "rm -rf " + eDir
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-
-        cmd = "rm -rf " + self.logDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        cmd = "rm -rf " + self.cfgDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        # cmd = "mkdir -p " + self.dataDir
-        # if os.system(cmd) != 0:
-        #     tdLog.exit(cmd)
-        for eDir in self.dataDir:
-             os.makedirs(eDir.split(' ')[0])
-
-        # cmd = "mkdir -p " + self.logDir
-        # if os.system(cmd) != 0:
-        #     tdLog.exit(cmd)
-        os.makedirs(self.logDir)
-
-        # cmd = "mkdir -p " + self.cfgDir
-        # if os.system(cmd) != 0:
-        #     tdLog.exit(cmd)
-        os.makedirs(self.cfgDir)
-
-        cmd = "touch " + self.cfgPath
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        if self.testCluster:
-            self.startIP()
-
-        if self.testCluster:
-            self.cfg("masterIp", "192.168.0.1")
-            self.cfg("secondIp", "192.168.0.2")
-            self.cfg("publicIp", "192.168.0.%d" % (self.index))
-            self.cfg("internalIp", "192.168.0.%d" % (self.index))
-            self.cfg("privateIp", "192.168.0.%d" % (self.index))
-        self.cfgDict["dataDir"] = self.dataDir
-        self.cfgDict["logDir"] = self.logDir
-        # self.cfg("dataDir",self.dataDir)
-        # self.cfg("logDir",self.logDir)
-        # print(updatecfgDict)
-        isFirstDir = 1
-        if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
-            for key, value in updatecfgDict[0][0].items():
-                if key == "clientCfg" and self.remoteIP == "" and not platform.system().lower() == 'windows':
-                    continue
-                if value == 'dataDir':
-                    if isFirstDir:
-                        self.cfgDict.pop('dataDir')
-                        self.cfg(value, key)
-                        isFirstDir = 0
-                    else:
-                        self.cfg(value, key)
-                else:
-                    self.addExtraCfg(key, value)
-        if (self.remoteIP == ""):
-            for key, value in self.cfgDict.items():
-                if type(value) == list:
-                    for v in value:
-                        self.cfg(key, v)
-                else:
-                    self.cfg(key, value)
-        else:
-            self.remoteExec(self.cfgDict, "tdDnodes.deploy(%d,updateCfgDict)"%self.index)
-
-        self.deployed = 1
-        tdLog.debug(
-            "dnode:%d is deployed and configured by %s" %
-            (self.index, self.cfgPath))
-
-    def getPath(self, tool="taosd"):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        paths = []
-        for root, dirs, files in os.walk(projPath):
-            if ((tool) in files or ("%s.exe"%tool) in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    paths.append(os.path.join(root, tool))
-                    break
-        if (len(paths) == 0):
-                return ""
-        return paths[0]
-
-    def starttaosd(self):
-        binPath = self.getPath()
-
-        if (binPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found: %s" % binPath)
-
-        if self.deployed == 0:
-            tdLog.exit("dnode:%d is not deployed" % (self.index))
-
-        if self.valgrind == 0:
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s -c %s" % (
-                    binPath, self.cfgDir)
-            else:
-                if self.asan:
-                    asanDir = "%s/sim/asan/dnode%d.asan" % (
-                        self.path, self.index)
-                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
-                        binPath, self.cfgDir, asanDir)
-                else:
-                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
-                        binPath, self.cfgDir)
-        else:
-            valgrindCmdline = "valgrind --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
-
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s %s -c %s" % (
-                    valgrindCmdline, binPath, self.cfgDir)
-            else:
-                cmd = "nohup %s %s -c %s 2>&1 & " % (
-                    valgrindCmdline, binPath, self.cfgDir)
-
-            print(cmd)
-
-        if (not self.remoteIP == ""):
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.start(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
-            self.running = 1
-        else:
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-            self.running = 1
-            tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
-            if self.valgrind == 0:
-                time.sleep(0.1)
-                key1 = 'from offline to online'
-                bkey1 = bytes(key1, encoding="utf8")
-                key2= 'TDengine initialized successfully'
-                bkey2 = bytes(key2, encoding="utf8")
-                logFile = self.logDir + "/taosdlog.0"
-                i = 0
-                # while not os.path.exists(logFile):
-                #     sleep(0.1)
-                #     i += 1
-                #     if i > 10:
-                #         break
-                # tailCmdStr = 'tail -f '
-                # if platform.system().lower() == 'windows':
-                #     tailCmdStr = 'tail -n +0 -f '
-                # popen = subprocess.Popen(
-                #     tailCmdStr + logFile,
-                #     stdout=subprocess.PIPE,
-                #     stderr=subprocess.PIPE,
-                #     shell=True)
-                # pid = popen.pid
-                # # print('Popen.pid:' + str(pid))
-                # timeout = time.time() + 60 * 2
-                # while True:
-                #     line = popen.stdout.readline().strip()
-                #     print(line)
-                #     if bkey1 in line:
-                #         popen.kill()
-                #         break
-                #     elif bkey2 in line:
-                #         popen.kill()
-                #         break
-                #     if time.time() > timeout:
-                #         print(time.time(),timeout)
-                #         tdLog.exit('wait too long for taosd start')
-                tdLog.debug("the dnode:%d has been started." % (self.index))
-            else:
-                tdLog.debug(
-                    "wait 10 seconds for the dnode:%d to start." %
-                    (self.index))
-                time.sleep(10)
-
-    def start(self):
-        binPath = self.getPath()
-
-        if (binPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found: %s" % binPath)
-
-        if self.deployed == 0:
-            tdLog.exit("dnode:%d is not deployed" % (self.index))
-
-        if self.valgrind == 0:
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s -c %s" % (
-                    binPath, self.cfgDir)
-            else:
-                if self.asan:
-                    asanDir = "%s/sim/asan/dnode%d.asan" % (
-                        self.path, self.index)
-                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
-                        binPath, self.cfgDir, asanDir)
-                else:
-                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
-                        binPath, self.cfgDir)
-        else:
-            valgrindCmdline = "valgrind --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
-
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s %s -c %s" % (
-                    valgrindCmdline, binPath, self.cfgDir)
-            else:
-                cmd = "nohup %s %s -c %s 2>&1 & " % (
-                    valgrindCmdline, binPath, self.cfgDir)
-
-            print(cmd)
-
-        if (not self.remoteIP == ""):
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.start(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
-            self.running = 1
-        else:
-            os.system("rm -rf %s/taosdlog.0"%self.logDir)
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-            self.running = 1
-            tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
-            if self.valgrind == 0:
-                time.sleep(0.1)
-                key = 'from offline to online'
-                bkey = bytes(key, encoding="utf8")
-                logFile = self.logDir + "/taosdlog.0"
-                i = 0
-                while not os.path.exists(logFile):
-                    sleep(0.1)
-                    i += 1
-                    if i > 50:
-                        break
-                with open(logFile) as f:
-                    timeout = time.time() + 10 * 2
-                    while True:
-                        line = f.readline().encode('utf-8')
-                        if bkey in line:
-                            break
-                        if time.time() > timeout:
-                            tdLog.exit('wait too long for taosd start')
-                    tdLog.debug("the dnode:%d has been started." % (self.index))
-            else:
-                tdLog.debug(
-                    "wait 10 seconds for the dnode:%d to start." %
-                    (self.index))
-                time.sleep(10)
-
-    def startWithoutSleep(self):
-        binPath = self.getPath()
-
-        if (binPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found: %s" % binPath)
-
-        if self.deployed == 0:
-            tdLog.exit("dnode:%d is not deployed" % (self.index))
-
-        if self.valgrind == 0:
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s -c %s" % (binPath, self.cfgDir)
-            else:
-                if self.asan:
-                    asanDir = "%s/sim/asan/dnode%d.asan" % (
-                        self.path, self.index)
-                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
-                        binPath, self.cfgDir, asanDir)
-                else:
-                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
-                        binPath, self.cfgDir)
-        else:
-            valgrindCmdline = "valgrind  --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
-            if platform.system().lower() == 'windows':
-                cmd = "mintty -h never %s %s -c %s" % (
-                    valgrindCmdline, binPath, self.cfgDir)
-            else:
-                cmd = "nohup %s %s -c %s 2>&1 & " % (
-                    valgrindCmdline, binPath, self.cfgDir)
-            print(cmd)
-
-        if (self.remoteIP == ""):
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-        else:
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].deployed=1\ntdDnodes.dnodes[%d].logDir=\"%%s/sim/dnode%%d/log\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.dnodes[%d].cfgDir=\"%%s/sim/dnode%%d/cfg\"%%(tdDnodes.dnodes[%d].path,%d)\ntdDnodes.startWithoutSleep(%d)"%(self.index-1,self.index-1,self.index-1,self.index,self.index-1,self.index-1,self.index,self.index))
-
-        self.running = 1
-        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
-
-    def stop(self):
-        if self.asan:
-            stopCmd = "%s -s stop -n dnode%d" % (self.execPath, self.index)
-            tdLog.info("execute script: " + stopCmd)
-            os.system(stopCmd)
-            return
-
-        if (not self.remoteIP == ""):
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].stop()"%(self.index-1,self.index-1))
-            tdLog.info("stop dnode%d"%self.index)
-            return
-        if self.valgrind == 0:
-            toBeKilled = "taosd"
-        else:
-            toBeKilled = "valgrind.bin"
-
-        if self.running != 0:
-            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs" % toBeKilled
-            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8").strip()
-
-            onlyKillOnceWindows = 0
-            while(processID):
-                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
-                    killCmd = "kill -INT %s > /dev/null 2>&1" % processID
-                    if platform.system().lower() == 'windows':
-                        killCmd = "kill -INT %s > nul 2>&1" % processID
-                    os.system(killCmd)
-                    onlyKillOnceWindows = 1
-                time.sleep(1)
-                processID = subprocess.check_output(
-                    psCmd, shell=True).decode("utf-8").strip()
-            if not platform.system().lower() == 'windows':
-                for port in range(6030, 6041):
-                    fuserCmd = "fuser -k -n tcp %d > /dev/null" % port
-                    os.system(fuserCmd)
-            if self.valgrind:
-                time.sleep(2)
-
-            self.running = 0
-            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
-
-
-    def stoptaosd(self):
-        tdLog.debug("start to stop taosd on dnode: %d "% (self.index))
-        # print(self.asan,self.running,self.remoteIP,self.valgrind)
-        if self.asan:
-            stopCmd = "%s -s stop -n dnode%d" % (self.execPath, self.index)
-            tdLog.info("execute script: " + stopCmd)
-            os.system(stopCmd)
-            return
-
-        if (not self.remoteIP == ""):
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].stop()"%(self.index-1,self.index-1))
-            tdLog.info("stop dnode%d"%self.index)
-            return
-        if self.valgrind == 0:
-            toBeKilled = "taosd"
-        else:
-            toBeKilled = "valgrind.bin"
-
-        if self.running != 0:
-            if platform.system().lower() == 'windows':
-                psCmd = "for /f %%a in ('wmic process where \"name='taosd.exe' and CommandLine like '%%dnode%d%%'\" get processId ^| xargs echo ^| awk ^'{print $2}^' ^&^& echo aa') do @(ps | grep %%a | awk '{print $1}' | xargs)" % (self.index)
-            else:
-                psCmd = "ps -ef|grep -w %s| grep dnode%d|grep -v grep | awk '{print $2}' | xargs" % (toBeKilled,self.index)
-            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8").strip()
-
-            onlyKillOnceWindows = 0
-            while(processID):
-                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
-                    killCmd = "kill -INT %s > /dev/null 2>&1" % processID
-                    if platform.system().lower() == 'windows':
-                        killCmd = "kill -INT %s > nul 2>&1" % processID
-                    os.system(killCmd)
-                    onlyKillOnceWindows = 1
-                time.sleep(1)
-                processID = subprocess.check_output(
-                    psCmd, shell=True).decode("utf-8").strip()
-            if self.valgrind:
-                time.sleep(2)
-
-            self.running = 0
-            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
-
-    def forcestop(self):
-        if self.asan:
-            stopCmd = "%s -s stop -n dnode%d -x SIGKILL" + \
-                (self.execPath, self.index)
-            tdLog.info("execute script: " + stopCmd)
-            os.system(stopCmd)
-            return
-
-        if (not self.remoteIP == ""):
-            self.remoteExec(self.cfgDict, "tdDnodes.dnodes[%d].running=1\ntdDnodes.dnodes[%d].forcestop()"%(self.index-1,self.index-1))
-            return
-        if self.valgrind == 0:
-            toBeKilled = "taosd"
-        else:
-            toBeKilled = "valgrind.bin"
-
-        if self.running != 0:
-            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs" % toBeKilled
-            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8").strip()
-
-            onlyKillOnceWindows = 0
-            while(processID):
-                if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'):
-                    killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
-                    os.system(killCmd)
-                    onlyKillOnceWindows = 1
-                time.sleep(1)
-                processID = subprocess.check_output(
-                    psCmd, shell=True).decode("utf-8").strip()
-            for port in range(6030, 6041):
-                fuserCmd = "fuser -k -n tcp %d" % port
-                os.system(fuserCmd)
-            if self.valgrind:
-                time.sleep(2)
-
-            self.running = 0
-            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
-
-    def startIP(self):
-        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-    def stopIP(self):
-        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
-            self.index, self.index)
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-    def cfg(self, option, value):
-        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-    def getDnodeRootDir(self, index):
-        dnodeRootDir = os.path.join(self.path,"sim","psim","dnode%d" % index)
-        return dnodeRootDir
-
-    def getDnodesRootDir(self):
-        dnodesRootDir = os.path.join(self.path,"sim","psim")
-        return dnodesRootDir
-
+# self
+from frame.log import *
+from frame.server.dnode import *
+from frame.server.simClient import *
 
 class TDDnodes:
     def __init__(self):
diff --git a/tests/army/frame/server/simClient.py b/tests/army/frame/server/simClient.py
new file mode 100644
index 0000000000..a4b719f798
--- /dev/null
+++ b/tests/army/frame/server/simClient.py
@@ -0,0 +1,116 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import platform
+import distro
+import subprocess
+from time import sleep
+import base64
+import json
+import copy
+from fabric2 import Connection
+from shutil import which
+
+# self
+from frame.log import *
+
+
+class TDSimClient:
+    def __init__(self, path):
+        self.testCluster = False
+        self.path = path
+        self.cfgDict = {
+            "fqdn": "localhost",
+            "numOfLogLines": "100000000",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "uDebugFlag": "135",
+            "jniDebugFlag": "135",
+            "qDebugFlag": "135",
+            "supportVnodes": "1024",
+            "enableQueryHb": "1",
+            "telemetryReporting": "0",
+            "tqDebugflag": "135",
+            "wDebugflag":"135",
+        }
+
+    def getLogDir(self):
+        self.logDir = os.path.join(self.path,"sim","psim","log")
+        return self.logDir
+
+    def getCfgDir(self):
+        self.cfgDir = os.path.join(self.path,"sim","psim","cfg")
+        return self.cfgDir
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def cfg(self, option, value):
+        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def deploy(self, *updatecfgDict):
+        self.logDir = os.path.join(self.path,"sim","psim","log")
+        self.cfgDir = os.path.join(self.path,"sim","psim","cfg")
+        self.cfgPath = os.path.join(self.path,"sim","psim","cfg","taos.cfg")
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        # cmd = "mkdir -p " + self.logDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.logDir)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        # cmd = "mkdir -p " + self.cfgDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.cfgDir)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+        self.cfg("logDir", self.logDir)
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
+        try:
+            if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
+                clientCfg = dict (updatecfgDict[0][0].get('clientCfg'))
+                for key, value in clientCfg.items():
+                    self.cfg(key, value)
+        except Exception:
+            pass
+
+        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
\ No newline at end of file
diff --git a/tests/army/frame/srvCtl.py b/tests/army/frame/srvCtl.py
index 155c83094d..e708656b70 100644
--- a/tests/army/frame/srvCtl.py
+++ b/tests/army/frame/srvCtl.py
@@ -16,8 +16,10 @@ import os
 import time
 import datetime
 
+from frame.server.dnode  import *
 from frame.server.dnodes import *
 
+
 class srvCtl:
     def __init__(self):
         # record server information
@@ -38,7 +40,14 @@ class srvCtl:
     def dnodeDataFiles(self, idx):
         files = []
         return files
+    
+    #
+    # get dnodes information
+    #
 
+    # taos.cfg position
+    def dnodeCfgPath(self, idx):
+        return tdDnodes.tdDnodes[idx-1].cfgPath
     
 
 sc = srvCtl()
\ No newline at end of file

From 782607fe68dc5c591c93722e1d5e6c0b175cc977 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 13:31:40 +0800
Subject: [PATCH 02/10] add case fullopt.py

---
 tests/army/community/cmdline/{taosd.py => fullopt.py} | 5 ++---
 tests/army/frame/srvCtl.py                            | 2 +-
 tests/parallel_test/cases.task                        | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/army/community/cmdline/{taosd.py => fullopt.py} (94%)

diff --git a/tests/army/community/cmdline/taosd.py b/tests/army/community/cmdline/fullopt.py
similarity index 94%
rename from tests/army/community/cmdline/taosd.py
rename to tests/army/community/cmdline/fullopt.py
index c361732dca..8a69ae11c5 100644
--- a/tests/army/community/cmdline/taosd.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -16,7 +16,7 @@ import time
 import random
 
 import taos
-import frame
+import frame.etool
 
 from frame.log import *
 from frame.sql import *
@@ -30,7 +30,6 @@ class TDTestCase(TBase):
     def insertData(self):
         tdLog.info(f"insert data.")
 
-        tdSql.execute(f"use {self.db}")
         # set insert data information
         self.childtable_count = 10
         self.insert_rows      = 10000
@@ -44,7 +43,7 @@ class TDTestCase(TBase):
         tdLog.info(f"do action.")
         
         # dump out sdb
-        sdb = epath.binFile("sdb.json")
+        sdb = "./sdb.json"
         eos.delFile(sdb)
 
         cfg = sc.dnodeCfgPath(1)
diff --git a/tests/army/frame/srvCtl.py b/tests/army/frame/srvCtl.py
index e708656b70..6c97d6bbc4 100644
--- a/tests/army/frame/srvCtl.py
+++ b/tests/army/frame/srvCtl.py
@@ -47,7 +47,7 @@ class srvCtl:
 
     # taos.cfg position
     def dnodeCfgPath(self, idx):
-        return tdDnodes.tdDnodes[idx-1].cfgPath
+        return tdDnodes.dnodes[idx-1].cfgPath
     
 
 sc = srvCtl()
\ No newline at end of file
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index f19a0bda46..a3f35cbef0 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -11,6 +11,7 @@
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/multi-level/mlevel_basic.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/s3/s3_basic.py -L 3 -D 1
 ,,y,army,./pytest.sh python3 ./test.py -f community/cluster/snapshot.py -N 3 -L 3 -D 2
+,,y,army,./pytest.sh python3 ./test.py -f community/cmdline/fullopt.py
 
 
 #

From 7b29c97f27cadddfa7c3ebcec4eb3fca13ef7ea3 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 14:50:17 +0800
Subject: [PATCH 03/10] feat: taosd full options do

---
 tests/army/community/cmdline/fullopt.py | 47 ++++++++++++++++++++-----
 tests/army/frame/caseBase.py            | 10 ++++--
 tests/army/frame/srvCtl.py              | 13 +++++++
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index 8a69ae11c5..e0a0a51bfc 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -36,20 +36,48 @@ class TDTestCase(TBase):
         self.timestamp_step   = 1000
 
         # taosBenchmark run
-        etool.runBenchmark(command = f"-d {self.db} -t {self.childtable_count} -n {self.insert_rows} -y")
+        etool.runBenchmark(command = f"-d {self.db} -t {self.childtable_count} -n {self.insert_rows} -v 2 -y")
         
 
-    def doAction(self):
-        tdLog.info(f"do action.")
+    def doTaosd(self):
+        tdLog.info(f"check taosd command options...")
+        idx = 1 # dnode1
+        cfg = sc.dnodeCfgPath(idx)
         
-        # dump out sdb
+        # -s
         sdb = "./sdb.json"
         eos.delFile(sdb)
-
-        cfg = sc.dnodeCfgPath(1)
         etool.runBinFile("taosd", f"-s -c {cfg}")
         self.checkFileExist(sdb)
-        
+
+        # -C
+        etool.runBinFile("taosd", "-C")
+        # -k 
+        rets = etool.runBinFile("taosd", "-C")
+        self.checkListNotEmpty(rets)
+        # -V
+        rets = etool.runBinFile("taosd", "-V")
+        self.checkListNotEmpty(rets)
+        # --help
+        rets = etool.runBinFile("taosd", "--help")
+        self.checkListNotEmpty(rets)
+
+        # except input
+        etool.runBinFile("taosd", "-c")
+        etool.runBinFile("taosd", "-e")
+
+        # stop taosd
+        sc.dnodeStop(idx)
+        # other
+        etool.runBinFile("taosd", f"-dm -c {cfg}")
+        sc.dnodeStop(idx)
+        etool.runBinFile("taosd", "-a http://192.168.1.10")
+        etool.runBinFile("taosd", f"-E abc -c {cfg}")
+        etool.runBinFile("taosd", f"-e abc -c {cfg}")
+
+    def doTaos(self):
+        tdLog.info(f"check taos command options...")
+
 
     # run
     def run(self):
@@ -59,7 +87,10 @@ class TDTestCase(TBase):
         self.insertData()
 
         # do action
-        self.doAction()
+        self.doTaosd()
+
+        # do taos
+        self.doTaos()
 
         tdLog.success(f"{__file__} successfully executed")
 
diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py
index 535b7aeeb4..c9f3aa1880 100644
--- a/tests/army/frame/caseBase.py
+++ b/tests/army/frame/caseBase.py
@@ -189,7 +189,13 @@ class TBase:
         
         return False    
 
-     # check file exist
+    # check file exist
     def checkFileExist(self, pathFile):
         if os.path.exists(pathFile) == False:
-            tdLog.exit(f"file not exist {pathFile}")
\ No newline at end of file
+            tdLog.exit(f"file not exist {pathFile}")
+
+    # check list not exist
+    def checkListNotEmpty(self, lists, tips=""):
+        if len(lists) == 0:
+            tdLog.exit(f"list is empty {tips}")
+
diff --git a/tests/army/frame/srvCtl.py b/tests/army/frame/srvCtl.py
index 6c97d6bbc4..c01ea33578 100644
--- a/tests/army/frame/srvCtl.py
+++ b/tests/army/frame/srvCtl.py
@@ -28,6 +28,19 @@ class srvCtl:
         self.mLevel = 0
         self.mLevelDisk = 0
 
+    #
+    #  control server
+    #
+
+    # start
+    def dnodeStart(self, idx):
+        return tdDnodes.starttaosd(idx)
+
+    # stop
+    def dnodeStop(self, idx):
+        return tdDnodes.stoptaosd(idx)
+
+
     #
     #  about path
     #

From 34878b4f0d2a52c0de50e5fe00a17c17676b43ec Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 15:10:48 +0800
Subject: [PATCH 04/10] tweak run and exe method

---
 tests/army/community/cluster/snapshot.py      |  2 +-
 tests/army/community/cmdline/fullopt.py       | 20 +++++++++++--------
 .../enterprise/multi-level/mlevel_basic.py    |  2 +-
 tests/army/enterprise/s3/s3_basic.py          |  2 +-
 tests/army/frame/eos.py                       |  8 ++++----
 tests/army/frame/etool.py                     | 12 +++++++++--
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/tests/army/community/cluster/snapshot.py b/tests/army/community/cluster/snapshot.py
index b177ba3b29..92ecc00726 100644
--- a/tests/army/community/cluster/snapshot.py
+++ b/tests/army/community/cluster/snapshot.py
@@ -34,7 +34,7 @@ class TDTestCase(TBase):
         tdLog.info(f"insert data.")
         # taosBenchmark run
         jfile = etool.curFile(__file__, "snapshot.json")
-        etool.runBenchmark(json=jfile)
+        etool.benchMark(json=jfile)
 
         tdSql.execute(f"use {self.db}")
         # set insert data information
diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index e0a0a51bfc..29711c7e0a 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -36,8 +36,11 @@ class TDTestCase(TBase):
         self.timestamp_step   = 1000
 
         # taosBenchmark run
-        etool.runBenchmark(command = f"-d {self.db} -t {self.childtable_count} -n {self.insert_rows} -v 2 -y")
-        
+        etool.benchMark(command = f"-d {self.db} -t {self.childtable_count} -n {self.insert_rows} -v 2 -y")
+
+    def doTaos(self):
+        tdLog.info(f"check taos command options...")
+
 
     def doTaosd(self):
         tdLog.info(f"check taosd command options...")
@@ -72,11 +75,11 @@ class TDTestCase(TBase):
         etool.runBinFile("taosd", f"-dm -c {cfg}")
         sc.dnodeStop(idx)
         etool.runBinFile("taosd", "-a http://192.168.1.10")
-        etool.runBinFile("taosd", f"-E abc -c {cfg}")
-        etool.runBinFile("taosd", f"-e abc -c {cfg}")
 
-    def doTaos(self):
-        tdLog.info(f"check taos command options...")
+        #exe 
+        etool.exeBinFile("taosd", f"-E abc -c {cfg}")
+        sc.dnodeStop(idx)
+        etool.exeBinFile("taosd", f"-e def -c {cfg}")
 
 
     # run
@@ -86,11 +89,12 @@ class TDTestCase(TBase):
         # insert data
         self.insertData()
 
+        # do taos
+        self.doTaos()
+
         # do action
         self.doTaosd()
 
-        # do taos
-        self.doTaos()
 
         tdLog.success(f"{__file__} successfully executed")
 
diff --git a/tests/army/enterprise/multi-level/mlevel_basic.py b/tests/army/enterprise/multi-level/mlevel_basic.py
index 3bec2bfb72..081a1bb9bd 100644
--- a/tests/army/enterprise/multi-level/mlevel_basic.py
+++ b/tests/army/enterprise/multi-level/mlevel_basic.py
@@ -32,7 +32,7 @@ class TDTestCase(TBase):
         tdLog.info(f"insert data.")
         # taosBenchmark run
         json = etool.curFile(__file__, "mlevel_basic.json")
-        etool.runBenchmark(json=json)
+        etool.benchMark(json=json)
 
         tdSql.execute(f"use {self.db}")
         # set insert data information
diff --git a/tests/army/enterprise/s3/s3_basic.py b/tests/army/enterprise/s3/s3_basic.py
index 8e7c1f2d35..f22d482502 100644
--- a/tests/army/enterprise/s3/s3_basic.py
+++ b/tests/army/enterprise/s3/s3_basic.py
@@ -54,7 +54,7 @@ class TDTestCase(TBase):
         tdLog.info(f"insert data.")
         # taosBenchmark run
         json = etool.curFile(__file__, "s3_basic.json")
-        etool.runBenchmark(json=json)
+        etool.benchMark(json=json)
 
         tdSql.execute(f"use {self.db}")
         # set insert data information
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index d0b37d1d10..defbaf4975 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -61,9 +61,9 @@ def exeNoWait(file):
 
 
 # run return output and error
-def run(command):
+def run(command, timeout = 10):
     process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    process.wait(3)
+    process.wait(timeout)
 
     output = process.stdout.read().decode(encoding="gbk")
     error = process.stderr.read().decode(encoding="gbk")
@@ -72,8 +72,8 @@ def run(command):
 
 
 # return list after run
-def runRetList(command):
-    output,error = run(command)
+def runRetList(command, timeout=10):
+    output,error = run(command, timeout)
     return output.splitlines()
 
 
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index d0c51ca39e..6ab827d028 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -24,7 +24,7 @@ import frame.eos
 from frame.log import *
 
 # run taosBenchmark with command or json file mode
-def runBenchmark(command = "", json = "") :
+def benchMark(command = "", json = "") :
     # get taosBenchmark path
     bmFile = frame.epath.binFile("taosBenchmark")
     if frame.eos.isWin():
@@ -52,4 +52,12 @@ def runBinFile(fname, command):
     if frame.eos.isWin():
         binFile += ".exe"
 
-    frame.eos.runRetList(f"{binFile} {command}")
\ No newline at end of file
+    frame.eos.runRetList(f"{binFile} {command}")
+
+# exe build/bin file
+def exeBinFile(fname, command):
+    binFile = frame.epath.binFile(fname)
+    if frame.eos.isWin():
+        binFile += ".exe"
+
+    frame.eos.exe(f"{binFile} {command}")
\ No newline at end of file

From 09f68ce80c8e705975fc0999ec7754e3dcd30373 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 15:12:57 +0800
Subject: [PATCH 05/10] tweak run and exe method

---
 tests/army/frame/etool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index 6ab827d028..2c22095ba7 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -60,4 +60,4 @@ def exeBinFile(fname, command):
     if frame.eos.isWin():
         binFile += ".exe"
 
-    frame.eos.exe(f"{binFile} {command}")
\ No newline at end of file
+    return frame.eos.exe(f"{binFile} {command}")
\ No newline at end of file

From 90b69d86eadc30f852a02f592bef280e0c7cf9a3 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 15:31:32 +0800
Subject: [PATCH 06/10] fix: output list fixed

---
 tests/army/community/cmdline/fullopt.py | 8 ++++----
 tests/army/frame/eos.py                 | 2 --
 tests/army/frame/etool.py               | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index 29711c7e0a..dfaee22c2f 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -66,15 +66,15 @@ class TDTestCase(TBase):
         self.checkListNotEmpty(rets)
 
         # except input
-        etool.runBinFile("taosd", "-c")
-        etool.runBinFile("taosd", "-e")
+        etool.exeBinFile("taosd", "-c")
+        etool.exeBinFile("taosd", "-e")
 
         # stop taosd
         sc.dnodeStop(idx)
         # other
-        etool.runBinFile("taosd", f"-dm -c {cfg}")
+        etool.exeBinFile("taosd", f"-dm -c {cfg}")
         sc.dnodeStop(idx)
-        etool.runBinFile("taosd", "-a http://192.168.1.10")
+        etool.exeBinFile("taosd", "-a http://192.168.1.10")
 
         #exe 
         etool.exeBinFile("taosd", f"-E abc -c {cfg}")
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index defbaf4975..bd84927c78 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -76,8 +76,6 @@ def runRetList(command, timeout=10):
     output,error = run(command, timeout)
     return output.splitlines()
 
-
-
 #
 #   file 
 #
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index 2c22095ba7..d57932b459 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -52,7 +52,7 @@ def runBinFile(fname, command):
     if frame.eos.isWin():
         binFile += ".exe"
 
-    frame.eos.runRetList(f"{binFile} {command}")
+    return frame.eos.runRetList(f"{binFile} {command}")
 
 # exe build/bin file
 def exeBinFile(fname, command):

From 5e47bc8e3a08e54b578c47a7dc8b672af1715700 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 15:45:21 +0800
Subject: [PATCH 07/10] fix: add exeNoWait

---
 tests/army/community/cmdline/fullopt.py | 7 +++----
 tests/army/frame/eos.py                 | 7 +++++--
 tests/army/frame/etool.py               | 7 +++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index dfaee22c2f..f6baf5b004 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -72,15 +72,14 @@ class TDTestCase(TBase):
         # stop taosd
         sc.dnodeStop(idx)
         # other
-        etool.exeBinFile("taosd", f"-dm -c {cfg}")
+        etool.exeBinFile("taosd", f"-dm -c {cfg}", False)
         sc.dnodeStop(idx)
         etool.exeBinFile("taosd", "-a http://192.168.1.10")
 
         #exe 
-        etool.exeBinFile("taosd", f"-E abc -c {cfg}")
+        etool.exeBinFile("taosd", f"-E abc -c {cfg}", False)
         sc.dnodeStop(idx)
-        etool.exeBinFile("taosd", f"-e def -c {cfg}")
-
+        etool.exeBinFile("taosd", f"-e def -c {cfg}", False)
 
     # run
     def run(self):
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index bd84927c78..6bd8fd3aab 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -57,8 +57,11 @@ def exe(file):
 
 # execute file and return immediately
 def exeNoWait(file):
-    print("exe no wait")
-
+    if isWin():
+        cmd = f"mintty -h never {file}"
+    else:
+        cmd = f"nohup {file} > /dev/null 2>&1 & "
+    return exe(file)
 
 # run return output and error
 def run(command, timeout = 10):
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index d57932b459..c06afcd76e 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -55,9 +55,12 @@ def runBinFile(fname, command):
     return frame.eos.runRetList(f"{binFile} {command}")
 
 # exe build/bin file
-def exeBinFile(fname, command):
+def exeBinFile(fname, command, wait=True):
     binFile = frame.epath.binFile(fname)
     if frame.eos.isWin():
         binFile += ".exe"
 
-    return frame.eos.exe(f"{binFile} {command}")
\ No newline at end of file
+    if wait:
+        return frame.eos.exe(f"{binFile} {command}")
+    else:
+        return frame.eos.exeNoWait(f"{binFile} {command}")
\ No newline at end of file

From cc909d7d30f493bf473158d16718a00111635025 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 17:07:09 +0800
Subject: [PATCH 08/10] fix: add taos command line test

---
 tests/army/community/cmdline/fullopt.py | 40 +++++++++++++++++++++++++
 tests/army/frame/eos.py                 |  2 +-
 tests/parallel_test/cases.task          |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index f6baf5b004..70be4eb920 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -40,6 +40,40 @@ class TDTestCase(TBase):
 
     def doTaos(self):
         tdLog.info(f"check taos command options...")
+        # help
+        rets = etool.runBinFile("taos", "--help")
+        self.checkListNotEmpty(rets)
+        # b r w s 
+        sql = f"select * from {self.db}.{self.stb} limit 10"
+        rets = etool.runBinFile("taos", f'-B -r -w -s "{sql}" ')
+        self.checkListNotEmpty(rets)
+        # -C
+        rets = etool.runBinFile("taos", "-C")
+        self.checkListNotEmpty(rets)
+        # -t
+        rets = etool.runBinFile("taos", "-t")
+        self.checkListNotEmpty(rets)
+        # -v
+        rets = etool.runBinFile("taos", "-V")
+        self.checkListNotEmpty(rets)
+        # -?
+        rets = etool.runBinFile("taos", "-?")
+        self.checkListNotEmpty(rets)
+
+        # TSDB_FQDN_LEN = 128
+        lname = "testhostnamelength"
+        lname.rjust(130, 'a')
+
+        # invalid
+        sql = f"show vgroups;"
+        etool.exeBinFile("taos", f'-h {lname} -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-u {lname} -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-d {lname} -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-a {lname} -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-p{lname}  -s "{sql}" ', wait=False)
+
+        etool.exeBinFile("taos", f'-N 200 -l 2048 -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-n server', wait=False)
 
 
     def doTaosd(self):
@@ -81,6 +115,10 @@ class TDTestCase(TBase):
         sc.dnodeStop(idx)
         etool.exeBinFile("taosd", f"-e def -c {cfg}", False)
 
+        # stop taosd test taos as server
+        sc.dnodeStop(idx)
+        etool.exeBinFile("taos", f'-n server', wait=False)
+
     # run
     def run(self):
         tdLog.debug(f"start to excute {__file__}")
@@ -94,6 +132,8 @@ class TDTestCase(TBase):
         # do action
         self.doTaosd()
 
+        
+
 
         tdLog.success(f"{__file__} successfully executed")
 
diff --git a/tests/army/frame/eos.py b/tests/army/frame/eos.py
index 6bd8fd3aab..802b62e052 100644
--- a/tests/army/frame/eos.py
+++ b/tests/army/frame/eos.py
@@ -61,7 +61,7 @@ def exeNoWait(file):
         cmd = f"mintty -h never {file}"
     else:
         cmd = f"nohup {file} > /dev/null 2>&1 & "
-    return exe(file)
+    return exe(cmd)
 
 # run return output and error
 def run(command, timeout = 10):
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index a3f35cbef0..119e0ed334 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -11,7 +11,7 @@
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/multi-level/mlevel_basic.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/s3/s3_basic.py -L 3 -D 1
 ,,y,army,./pytest.sh python3 ./test.py -f community/cluster/snapshot.py -N 3 -L 3 -D 2
-,,y,army,./pytest.sh python3 ./test.py -f community/cmdline/fullopt.py
+,,n,army,./pytest.sh python3 ./test.py -f community/cmdline/fullopt.py
 
 
 #

From bdcd4732cc1734f16aad06375c5644e6c5e92e4b Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 17:21:48 +0800
Subject: [PATCH 09/10] fix: fullopt.py test ok

---
 tests/army/community/cmdline/fullopt.py |  6 ++++--
 tests/army/frame/etool.py               | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index 70be4eb920..22667149ae 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -45,7 +45,7 @@ class TDTestCase(TBase):
         self.checkListNotEmpty(rets)
         # b r w s 
         sql = f"select * from {self.db}.{self.stb} limit 10"
-        rets = etool.runBinFile("taos", f'-B -r -w -s "{sql}" ')
+        rets = etool.runBinFile("taos", f'-B -r -w 100 -s "{sql}" ')
         self.checkListNotEmpty(rets)
         # -C
         rets = etool.runBinFile("taos", "-C")
@@ -64,14 +64,16 @@ class TDTestCase(TBase):
         lname = "testhostnamelength"
         lname.rjust(130, 'a')
 
-        # invalid
+        # except test
         sql = f"show vgroups;"
         etool.exeBinFile("taos", f'-h {lname} -s "{sql}" ', wait=False)
         etool.exeBinFile("taos", f'-u {lname} -s "{sql}" ', wait=False)
         etool.exeBinFile("taos", f'-d {lname} -s "{sql}" ', wait=False)
         etool.exeBinFile("taos", f'-a {lname} -s "{sql}" ', wait=False)
         etool.exeBinFile("taos", f'-p{lname}  -s "{sql}" ', wait=False)
+        etool.exeBinFile("taos", f'-w -s "{sql}" ', wait=False)
 
+        # others
         etool.exeBinFile("taos", f'-N 200 -l 2048 -s "{sql}" ', wait=False)
         etool.exeBinFile("taos", f'-n server', wait=False)
 
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index c06afcd76e..0650d4a0e2 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -47,20 +47,28 @@ def curFile(fullPath, filename):
 
 
 # run build/bin file
-def runBinFile(fname, command):
+def runBinFile(fname, command, show=True):
     binFile = frame.epath.binFile(fname)
     if frame.eos.isWin():
         binFile += ".exe"
 
-    return frame.eos.runRetList(f"{binFile} {command}")
+    cmd = f"{binFile} {command}"
+    if show:
+        tdLog.info(cmd)
+    return frame.eos.runRetList(cmd)
 
 # exe build/bin file
-def exeBinFile(fname, command, wait=True):
+def exeBinFile(fname, command, wait=True, show=True):
     binFile = frame.epath.binFile(fname)
     if frame.eos.isWin():
         binFile += ".exe"
 
+    cmd = f"{binFile} {command}"
     if wait:
+        if show:
+            tdLog.info("wait exe:" + cmd)
         return frame.eos.exe(f"{binFile} {command}")
     else:
-        return frame.eos.exeNoWait(f"{binFile} {command}")
\ No newline at end of file
+        if show:
+            tdLog.info("no wait exe:" + cmd)
+        return frame.eos.exeNoWait(cmd)
\ No newline at end of file

From 9b94b7bf002ec31d1bf0060026379a37e77da557 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 21:24:13 +0800
Subject: [PATCH 10/10] fix: remove asan check fullopt.py

---
 tests/parallel_test/cases.task | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 119e0ed334..63745f75ab 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -11,7 +11,7 @@
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/multi-level/mlevel_basic.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f enterprise/s3/s3_basic.py -L 3 -D 1
 ,,y,army,./pytest.sh python3 ./test.py -f community/cluster/snapshot.py -N 3 -L 3 -D 2
-,,n,army,./pytest.sh python3 ./test.py -f community/cmdline/fullopt.py
+,,n,army,python3 ./test.py -f community/cmdline/fullopt.py
 
 
 #