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

Merge branch 'feature/TD-1413' of https://github.com/taosdata/TDengine into feature/TD-1413

This commit is contained in:
Hongze Cheng 2020-10-22 23:53:35 +08:00
parent 7e6021bc6a a5523872e7
commit 7c9ef17602
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/src/tglobal.c
View File

@ -321,22 +321,27 @@ void taosAddDataDir(int index, char *v1, int level, int primary) {
#ifndef _STORAGE
void taosReadDataDirCfg(char *v1, char *v2, char *v3) {
taosAddDataDir(0, tsDataDir, 0, 1);
tstrncpy(tsDiskCfg[0].dir, tsDataDir, TSDB_FILENAME_LEN);
if (tsDiskCfgNum == 1) {
SDiskCfg *cfg = &tsDiskCfg[0];
uInfo("dataDir:%s, level:%d primary:%d is replaced by %s", cfg->dir, cfg->level, cfg->primary, v1);
}
taosAddDataDir(0, v1, 0, 1);
tsDiskCfgNum = 1;
}
#endif
void taosPrintDataDirCfg() {
for (int i = 0; i < tsDiskCfgNum; ++i) {
SDiskCfg *cfg = &tsDiskCfg[i];
uInfo(" dataDir:%s level:%d primary:%d", cfg->dir, cfg->level, cfg->primary);
uInfo(" dataDir: %s", cfg->dir);
}
}
#endif
static void taosCheckDataDirCfg() {
if (tsDiskCfgNum <= 0) {
taosAddDataDir(0, tsDataDir, 0, 1);
tsDiskCfgNum = 1;
uTrace("dataDir:%s, level:0 primary:1 is configured by default", tsDataDir);
}
}

10
src/dnode/src/dnodeMain.c
View File

@ -104,7 +104,7 @@ int32_t dnodeInitSystem() {
signal(SIGPIPE, SIG_IGN);
if (dnodeCreateDir(tsLogDir) < 0) {
printf("failed to create dir: %s, reason: %s\n", tsLogDir, strerror(errno));
printf("failed to create log dir: %s, reason: %s\n", tsLogDir, strerror(errno));
return -1;
}
@ -186,13 +186,13 @@ static int32_t dnodeInitStorage() {
//TODO(dengyihao): no need to init here
tdGetMnodeRootDir(tsDataDir, tsMnodeDir);
if (dnodeCreateDir(tsMnodeDir) < 0) {
dError("failed to create dir: %s, reason: %s", tsMnodeDir, strerror(errno));
dError("failed to create mnode dir: %s, reason: %s", tsMnodeDir, strerror(errno));
return -1;
}
tdGetDnodeRootDir(tsDataDir, tsDnodeDir);
if (dnodeCreateDir(tsDnodeDir) < 0) {
dError("failed to create dir: %s, reason: %s", tsDnodeDir, strerror(errno));
dError("failed to create dnode dir: %s, reason: %s", tsDnodeDir, strerror(errno));
return -1;
}
@ -205,13 +205,13 @@ static int32_t dnodeInitStorage() {
tdGetVnodeRootDir(dirName, pDisk->dir);
if (dnodeCreateDir(dirName) < 0) {
dError("failed to create dir: %s, reason: %s", dirName, strerror(errno));
dError("failed to create vnode dir: %s, reason: %s", dirName, strerror(errno));
return -1;
}
tdGetVnodeBackRootDir(dirName, pDisk->dir);
if (dnodeCreateDir(dirName) < 0) {
dError("failed to create dir: %s, reason: %s", dirName, strerror(errno));
dError("failed to create vnode back dir: %s, reason: %s", dirName, strerror(errno));
return -1;
}
}

27
src/util/src/tconfig.c
View File

@ -97,19 +97,20 @@ static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
}
}
static void taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
static bool taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
int length = (int)strlen(input_value);
char *option = (char *)cfg->ptr;
if (length <= 0 || length > cfg->ptrLength) {
uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
cfg->option, input_value, cfg->ptrLength, option);
uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s", cfg->option,
input_value, cfg->ptrLength, option);
return false;
} else {
if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
wordexp_t full_path;
if (0 != wordexp(input_value, &full_path, 0)) {
printf("\nconfig dir: %s wordexp fail! reason:%s\n", input_value, strerror(errno));
wordfree(&full_path);
return;
return false;
}
if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
@ -121,8 +122,9 @@ static void taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
int code = taosMkDir(option, 0755);
if (code != 0) {
terrno = TAOS_SYSTEM_ERROR(errno);
uError("config option:%s, input value:%s, directory not exist, create fail:%s",
cfg->option, input_value, strerror(errno));
uError("config option:%s, input value:%s, directory not exist, create fail:%s", cfg->option, input_value,
strerror(errno));
return false;
}
cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
} else {
@ -130,6 +132,8 @@ static void taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
tsCfgStatusStr[cfg->cfgStatus], option);
}
}
return true;
}
static void taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
@ -225,8 +229,10 @@ static void taosReadConfigOption(const char *option, char *value, char *value2,
taosReadDirectoryConfig(cfg, value);
break;
case TAOS_CFG_VTYPE_DATA_DIRCTORY:
taosReadDirectoryConfig(cfg, value);
if (taosReadDirectoryConfig(cfg, value)) {
taosReadDataDirCfg(value, value2, value3);
}
break;
default:
uError("config option:%s, input value:%s, can't be recognized", option, value);
break;
@ -349,10 +355,11 @@ bool taosReadGlobalCfg() {
value[vlen] = 0;
paGetToken(value + vlen + 1, &value2, &vlen2);
if (vlen2 != 0) value2[vlen2] = 0;
paGetToken(value + vlen2 + 1, &value3, &vlen3);
if (vlen2 != 0) {
value2[vlen2] = 0;
paGetToken(value2 + vlen2 + 1, &value3, &vlen3);
if (vlen3 != 0) value3[vlen3] = 0;
}
taosReadConfigOption(option, value, value2, value3);
}