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

Merge pull request #26500 from taosdata/fix/TS-5154-3.0 

fix/TS-5154-3.0
This commit is contained in:
Hongze Cheng 2024-07-11 16:03:19 +08:00 committed by GitHub
parent 5957b2c19a 051956eb82
commit 3303a462e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1344,7 +1344,10 @@ int32_t taosReadDataFolder(const char *cfgDir, const char **envCmd, const char *
return -1; return -1;
} }
tstrncpy(tsDataDir, cfgGetItem(pCfg, "dataDir")->str, PATH_MAX); if (taosSetTfsCfg(pCfg) != 0) {
cfgCleanup(pCfg);
return -1;
}
dDebugFlag = cfgGetItem(pCfg, "dDebugFlag")->i32; dDebugFlag = cfgGetItem(pCfg, "dDebugFlag")->i32;
cfgCleanup(pCfg); cfgCleanup(pCfg);

2
source/dnode/mgmt/exe/dmMain.c
View File

@ -369,7 +369,7 @@ int mainWindows(int argc, char **argv) {
if(global.generateCode) { if(global.generateCode) {
bool toLogFile = false; bool toLogFile = false;
if(taosReadDataFolder(configDir, global.envCmd, global.envFile, global.apolloUrl, global.pArgs) != 0){ if(taosReadDataFolder(configDir, global.envCmd, global.envFile, global.apolloUrl, global.pArgs) != 0){
encryptError("failed to generate encrypt code since taosd is running, please stop it first"); encryptError("failed to generate encrypt code since dataDir can not be set from cfg file");
return -1; return -1;
}; };