From c5a74d6f993cf7783dc6c0e05e2b99979bb26c4a Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Wed, 2 Mar 2022 09:22:22 +0800 Subject: [PATCH] do not create default dataDir on startup --- source/common/src/tglobal.c | 16 ++++++++++++++++ source/util/src/tconfig.c | 2 ++ 2 files changed, 18 insertions(+) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 5745a70ca2..d66895888b 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -467,6 +467,12 @@ int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDi taosSetAllDebugFlag(cfgGetItem(pCfg, "debugFlag")->i32); + if (taosMkDir(tsLogDir) != 0) { + uError("failed to create dir:%s since %s", tsLogDir, terrstr()); + cfgCleanup(pCfg); + return -1; + } + if (taosInitLog(logname, logFileNum) != 0) { uError("failed to init log file since %s", terrstr()); cfgCleanup(pCfg); @@ -514,6 +520,16 @@ int32_t taosInitCfg(const char *cfgDir, const char *envFile, const char *apolloU } taosSetSystemCfg(tsCfg); + if (taosMkDir(tsTempDir) != 0) { + uError("failed to create dir:%s since %s", tsTempDir, terrstr()); + return -1; + } + + if (!tsc && taosMkDir(tsDataDir) != 0) { + uError("failed to create dir:%s since %s", tsDataDir, terrstr()); + return -1; + } + cfgDumpCfg(tsCfg, tsc, false); return 0; } diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c index 84af091fb3..0f22d15cd4 100644 --- a/source/util/src/tconfig.c +++ b/source/util/src/tconfig.c @@ -145,10 +145,12 @@ static int32_t cfgCheckAndSetDir(SConfigItem *pItem, const char *inputDir) { return -1; } +#if 0 if (taosMkDir(fullDir) != 0) { uError("failed to create dir:%s realpath:%s since %s", inputDir, fullDir, terrstr()); return -1; } +#endif cfgFreeItem(pItem); pItem->str = strdup(fullDir);