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

fix: disable dynamic modification of 'tempdir'

This commit is contained in:
Shungang Li 2024-07-15 15:15:17 +08:00
parent 4951ed9fa7
commit 57dc3f4562
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/src/tglobal.c
View File

@ -504,7 +504,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
if (cfgAddString(pCfg, "secondEp", "", CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) return -1; if (cfgAddString(pCfg, "secondEp", "", CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) return -1;
if (cfgAddString(pCfg, "fqdn", defaultFqdn, CFG_SCOPE_SERVER, CFG_DYN_CLIENT) != 0) return -1; if (cfgAddString(pCfg, "fqdn", defaultFqdn, CFG_SCOPE_SERVER, CFG_DYN_CLIENT) != 0) return -1;
if (cfgAddInt32(pCfg, "serverPort", defaultServerPort, 1, 65056, CFG_SCOPE_SERVER, CFG_DYN_CLIENT) != 0) return -1; if (cfgAddInt32(pCfg, "serverPort", defaultServerPort, 1, 65056, CFG_SCOPE_SERVER, CFG_DYN_CLIENT) != 0) return -1;
if (cfgAddDir(pCfg, "tempDir", tsTempDir, CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) return -1; if (cfgAddDir(pCfg, "tempDir", tsTempDir, CFG_SCOPE_BOTH, CFG_DYN_NONE) != 0) return -1;
if (cfgAddFloat(pCfg, "minimalTmpDirGB", 1.0f, 0.001f, 10000000, CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) return -1; if (cfgAddFloat(pCfg, "minimalTmpDirGB", 1.0f, 0.001f, 10000000, CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) return -1;
if (cfgAddInt32(pCfg, "shellActivityTimer", tsShellActivityTimer, 1, 120, CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0) if (cfgAddInt32(pCfg, "shellActivityTimer", tsShellActivityTimer, 1, 120, CFG_SCOPE_BOTH, CFG_DYN_CLIENT) != 0)
return -1; return -1;

21
tests/army/cmdline/fullopt.py
View File

@ -28,13 +28,13 @@ from frame import *
class TDTestCase(TBase): class TDTestCase(TBase):
updatecfgDict = { updatecfgDict = {
'queryMaxConcurrentTables': '2K', 'queryMaxConcurrentTables': '2K',
'streamMax': '1M', 'streamMax': '1M',
'totalMemoryKB': '1G', 'totalMemoryKB': '1G',
'streamMax': '1P', 'streamMax': '1P',
'streamBufferSize':'1T', 'streamBufferSize':'1T',
'slowLogScope':"query" 'slowLogScope':"query"
} }
def insertData(self): def insertData(self):
tdLog.info(f"insert data.") tdLog.info(f"insert data.")
@ -53,7 +53,7 @@ class TDTestCase(TBase):
def doTaos(self): def doTaos(self):
tdLog.info(f"check taos command options...") tdLog.info(f"check taos command options...")
# local command # local command
options = [ options = [
"DebugFlag 143", "DebugFlag 143",
@ -71,7 +71,6 @@ class TDTestCase(TBase):
"smlTsDefaultName tsdef", "smlTsDefaultName tsdef",
"serverPort 6030", "serverPort 6030",
"timezone tz", "timezone tz",
"tempDir /var/tmp"
] ]
# exec # exec
for option in options: for option in options:
@ -83,7 +82,7 @@ class TDTestCase(TBase):
# help # help
rets = etool.runBinFile("taos", "--help") rets = etool.runBinFile("taos", "--help")
self.checkListNotEmpty(rets) self.checkListNotEmpty(rets)
# b r w s # b r w s
sql = f"select * from {self.db}.{self.stb} limit 10" sql = f"select * from {self.db}.{self.stb} limit 10"
rets = etool.runBinFile("taos", f'-B -r -w 100 -s "{sql}" ') rets = etool.runBinFile("taos", f'-B -r -w 100 -s "{sql}" ')
self.checkListNotEmpty(rets) self.checkListNotEmpty(rets)
@ -124,16 +123,16 @@ class TDTestCase(TBase):
tdLog.info(f"check taosd command options...") tdLog.info(f"check taosd command options...")
idx = 1 # dnode1 idx = 1 # dnode1
cfg = sc.dnodeCfgPath(idx) cfg = sc.dnodeCfgPath(idx)
# -s # -s
sdb = "./sdb.json" sdb = "./sdb.json"
eos.delFile(sdb) eos.delFile(sdb)
etool.exeBinFile("taosd", f"-s -c {cfg}") etool.exeBinFile("taosd", f"-s -c {cfg}")
# -C # -C
etool.exeBinFile("taosd", "-C") etool.exeBinFile("taosd", "-C")
# -k # -k
etool.exeBinFile("taosd", "-k", False) etool.exeBinFile("taosd", "-k", False)
# -V # -V
rets = etool.runBinFile("taosd", "-V") rets = etool.runBinFile("taosd", "-V")
@ -153,7 +152,7 @@ class TDTestCase(TBase):
sc.dnodeStop(idx) sc.dnodeStop(idx)
etool.exeBinFile("taosd", "-a http://192.168.1.10") etool.exeBinFile("taosd", "-a http://192.168.1.10")
#exe #exe
etool.exeBinFile("taosd", f"-E abc -c {cfg}", False) etool.exeBinFile("taosd", f"-E abc -c {cfg}", False)
sc.dnodeStop(idx) sc.dnodeStop(idx)
etool.exeBinFile("taosd", f"-e def -c {cfg}", False) etool.exeBinFile("taosd", f"-e def -c {cfg}", False)
@ -182,7 +181,7 @@ class TDTestCase(TBase):
# do action # do action
self.doTaosd() self.doTaosd()
tdLog.success(f"{__file__} successfully executed") tdLog.success(f"{__file__} successfully executed")