Merge pull request #13830 from taosdata/fix/ZhiqiangWang/TD-16357-add-taosd-assert-kill
test: add taosd assert kill
This commit is contained in:
commit
007470ff06
|
@ -1899,7 +1899,7 @@ _return:
|
|||
|
||||
|
||||
void ctgUpdateThreadUnexpectedStopped(void) {
|
||||
if (CTG_IS_LOCKED(&gCtgMgmt.lock) > 0) CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
|
||||
if (!atomic_load_8((int8_t*)&gCtgMgmt.exit) && CTG_IS_LOCKED(&gCtgMgmt.lock) > 0) CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
|
||||
}
|
||||
|
||||
void ctgCleanupCacheQueue(void) {
|
||||
|
|
|
@ -134,7 +134,7 @@ class TDTestCase:
|
|||
parameterDict['cfg'] = cfgPath
|
||||
prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
|
||||
prepareEnvThread.start()
|
||||
time.sleep(2)
|
||||
prepareEnvThread.join()
|
||||
|
||||
# wait stb ready
|
||||
while 1:
|
||||
|
@ -245,6 +245,7 @@ class TDTestCase:
|
|||
|
||||
prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
|
||||
prepareEnvThread.start()
|
||||
prepareEnvThread.join()
|
||||
|
||||
# wait db ready
|
||||
while 1:
|
||||
|
@ -371,6 +372,7 @@ class TDTestCase:
|
|||
|
||||
prepareEnvThread = threading.Thread(target=self.prepareEnv, kwargs=parameterDict)
|
||||
prepareEnvThread.start()
|
||||
prepareEnvThread.join()
|
||||
|
||||
# wait db ready
|
||||
while 1:
|
||||
|
|
|
@ -61,7 +61,8 @@ goto :eof
|
|||
set tt=%1
|
||||
set tt=%tt:.= %
|
||||
set tt=%tt::= %
|
||||
set index=1
|
||||
set tt=%tt: 0= %
|
||||
set /a index=1
|
||||
for %%a in (%tt%) do (
|
||||
if !index! EQU 1 (
|
||||
set /a hh=%%a
|
||||
|
@ -75,5 +76,5 @@ for %%a in (%tt%) do (
|
|||
)
|
||||
set /a index=index+1
|
||||
)
|
||||
set /a _timeTemp=(%hh%*60+%mm%)*60+%ss% || echo hh:%hh% mm:%mm% ss:%ss%
|
||||
set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
|
||||
goto :eof
|
|
@ -21,6 +21,7 @@ import base64
|
|||
import json
|
||||
import platform
|
||||
import socket
|
||||
import threading
|
||||
from distutils.log import warn as printf
|
||||
from fabric2 import Connection
|
||||
sys.path.append("../pytest")
|
||||
|
@ -30,6 +31,13 @@ from util.cases import *
|
|||
|
||||
import taos
|
||||
|
||||
def checkRunTimeError():
|
||||
import win32gui
|
||||
while 1:
|
||||
time.sleep(1)
|
||||
hwnd = win32gui.FindWindow(None, "Microsoft Visual C++ Runtime Library")
|
||||
if hwnd:
|
||||
os.system("TASKKILL /F /IM taosd.exe")
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
|
@ -42,9 +50,6 @@ if __name__ == "__main__":
|
|||
logSql = True
|
||||
stop = 0
|
||||
restart = False
|
||||
windows = 0
|
||||
if platform.system().lower() == 'windows':
|
||||
windows = 1
|
||||
updateCfgDict = {}
|
||||
execCmd = ""
|
||||
opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:', [
|
||||
|
@ -159,7 +164,9 @@ if __name__ == "__main__":
|
|||
host = masterIp
|
||||
|
||||
tdLog.info("Procedures for tdengine deployed in %s" % (host))
|
||||
if windows:
|
||||
if platform.system().lower() == 'windows':
|
||||
if (masterIp == "" and not fileName[0:12] == "0-others\\udf"):
|
||||
threading.Thread(target=checkRunTimeError,daemon=True).start()
|
||||
tdCases.logSql(logSql)
|
||||
tdLog.info("Procedures for testing self-deployment")
|
||||
tdDnodes.init(deployPath, masterIp)
|
||||
|
|
Loading…
Reference in New Issue