xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-1207

This commit is contained in:
Shengliang Guan 2021-01-21 15:05:09 +08:00
parent 4b720b383a
commit 05ce993084
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/script/sh/deploy.bat
View File

@ -59,7 +59,7 @@ for /f "skip=1" %%A in (
'wmic computersystem get caption' 'wmic computersystem get caption'
) do if not defined fqdn set "fqdn=%%A" ) do if not defined fqdn set "fqdn=%%A"
echo firstEp %fqdn% > %TAOS_CFG% echo firstEp %fqdn%:7100 > %TAOS_CFG%
echo fqdn %fqdn% >> %TAOS_CFG% echo fqdn %fqdn% >> %TAOS_CFG%
echo serverPort %NODE% >> %TAOS_CFG% echo serverPort %NODE% >> %TAOS_CFG%
echo dataDir %DATA_DIR% >> %TAOS_CFG% echo dataDir %DATA_DIR% >> %TAOS_CFG%

2
tests/script/sh/exec.bat
View File

@ -40,7 +40,7 @@ if %EXEC_OPTON% == stop (
rem wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" call terminate > NUL 2>&1 rem wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" call terminate > NUL 2>&1
for /f "tokens=1 skip=1" %%A in ( for /f "tokens=1 skip=1" %%A in (
'wmic process where "name='taosd.exe'" get processId ' 'wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" get processId '
) do ( ) do (
rem echo taskkill /IM %%A rem echo taskkill /IM %%A
taskkill /IM %%A > NUL 2>&1 taskkill /IM %%A > NUL 2>&1

1
tests/script/sh/stop_dnodes.bat
View File

@ -2,4 +2,5 @@
rem echo taskkill /F /IM taosd.exe rem echo taskkill /F /IM taosd.exe
wmic process where "name='taosd.exe'" call terminate > NUL 2>&1
taskkill /F /IM taosd.exe > NUL 2>&1 taskkill /F /IM taosd.exe > NUL 2>&1

2
tests/tsim/src/simSystem.c
View File

@ -78,8 +78,8 @@ char *simParseHostName(char *varName) {
} }
bool simSystemInit() { bool simSystemInit() {
taosGetFqdn(simHostName);
taos_init(); taos_init();
taosGetFqdn(simHostName);
simInitsimCmdList(); simInitsimCmdList();
memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM); memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);
return true; return true;