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

fix some bug

This commit is contained in:
Hongze Cheng 2020-10-27 03:32:26 +00:00
parent cdd74abd3f
commit a24c1e22f3
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/inc/tpath.h
View File

@ -22,35 +22,35 @@
extern "C" { extern "C" {
#endif #endif
static FORCE_INLINE void tdGetMnodeRootDir(char *baseDir, char *dirName) { static FORCE_INLINE void tdGetMnodeRootDir(const char *baseDir, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/mnode", baseDir); snprintf(dirName, TSDB_FILENAME_LEN, "%s/mnode", baseDir);
} }
static FORCE_INLINE void tdGetDnodeRootDir(char *baseDir, char *dirName) { static FORCE_INLINE void tdGetDnodeRootDir(const char *baseDir, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/dnode", baseDir); snprintf(dirName, TSDB_FILENAME_LEN, "%s/dnode", baseDir);
} }
static FORCE_INLINE void tdGetVnodeRootDir(char *baseDir, char *dirName) { static FORCE_INLINE void tdGetVnodeRootDir(const char *baseDir, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode", baseDir); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode", baseDir);
} }
static FORCE_INLINE void tdGetVnodeBackRootDir(char *baseDir, char *dirName) { static FORCE_INLINE void tdGetVnodeBackRootDir(const char *baseDir, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak", baseDir); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak", baseDir);
} }
static FORCE_INLINE void tdGetVnodeDir(char *baseDir, int vid, char *dirName) { static FORCE_INLINE void tdGetVnodeDir(const char *baseDir, int vid, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d", baseDir, vid); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d", baseDir, vid);
} }
static FORCE_INLINE void tdGetVnodeBackDir(char *baseDir, int vid, char *dirName) { static FORCE_INLINE void tdGetVnodeBackDir(const char *baseDir, int vid, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak/vnode%d", baseDir, vid); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak/vnode%d", baseDir, vid);
} }
static FORCE_INLINE void tdGetTsdbRootDir(char *baseDir, int vid, char *dirName) { static FORCE_INLINE void tdGetTsdbRootDir(const char *baseDir, int vid, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb", baseDir, vid); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb", baseDir, vid);
} }
static FORCE_INLINE void tdGetTsdbDataDir(char *baseDir, int vid, char *dirName) { static FORCE_INLINE void tdGetTsdbDataDir(const char *baseDir, int vid, char *dirName) {
snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb/data", baseDir, vid); snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb/data", baseDir, vid);
} }

2
src/common/src/tdisk.c
View File

@ -160,7 +160,7 @@ SDisk *tdAssignDisk(SDnodeTier *pDnodeTier, int level) {
tdUnLockTiers(pDnodeTier); tdUnLockTiers(pDnodeTier);
return NULL; return pDisk;
} }
SDisk *tdGetDiskByName(SDnodeTier *pDnodeTier, char *dirName) { SDisk *tdGetDiskByName(SDnodeTier *pDnodeTier, char *dirName) {

1
src/dnode/CMakeLists.txt
View File

@ -48,6 +48,7 @@ IF (TD_LINUX)
COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMAND ${CMAKE_COMMAND} -E echo monitor 0 >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
COMMENT "prepare taosd environment") COMMENT "prepare taosd environment")
ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD}) ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
ENDIF () ENDIF ()

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

@ -209,7 +209,7 @@ static int32_t dnodeInitStorage() {
return -1; return -1;
} }
tdGetVnodeBackRootDir(dirName, pDisk->dir); tdGetVnodeBackRootDir(pDisk->dir, dirName);
if (dnodeCreateDir(dirName) < 0) { if (dnodeCreateDir(dirName) < 0) {
dError("failed to create vnode back dir: %s, reason: %s", dirName, strerror(errno)); dError("failed to create vnode back dir: %s, reason: %s", dirName, strerror(errno));
return -1; return -1;