From 0ba581ec3d12e9a95962c05576e4f6f7ce52a784 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Fri, 7 Aug 2020 14:48:13 +0800 Subject: [PATCH 1/4] [add error log for flock] --- src/dnode/src/dnodeMain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index f521fbe02b..96f8f43265 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -159,7 +159,7 @@ static void dnodeCheckDataDirOpenned(char *dir) { } int32_t ret = flock(fd, LOCK_EX | LOCK_NB); if (ret != 0) { - dError("failed to lock file:%s ret:%d, database may be running, quit", filepath, ret); + dError("failed to lock file:%s ret:%d[%s], database may be running, quit", filepath, ret, strerror(errno)); close(fd); exit(0); } From 5ede107b9458a9c9e0d91520cc1241d8fc6a3a0f Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 7 Aug 2020 15:54:51 +0800 Subject: [PATCH 2/4] minor changes for cmake --- cmake/define.inc | 34 +++++++++++++++--------------- src/kit/taosnetwork/CMakeLists.txt | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmake/define.inc b/cmake/define.inc index 5c005b0cb5..f12806d6bd 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -29,6 +29,23 @@ IF (TD_RANDOM_NETWORK_FAIL) ADD_DEFINITIONS(-DTAOS_RANDOM_NETWORK_FAIL) ENDIF () +IF (TD_LINUX_64) + ADD_DEFINITIONS(-D_M_X64) + ADD_DEFINITIONS(-D_TD_LINUX_64) + SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") + + FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/) + IF (ICONV_INCLUDE_EXIST) + ADD_DEFINITIONS(-DUSE_LIBICONV) + ENDIF () +ENDIF () + +IF (TD_LINUX_32) + ADD_DEFINITIONS(-D_TD_LINUX_32) + ADD_DEFINITIONS(-DUSE_LIBICONV) + SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -munaligned-access -fpack-struct=8 -latomic -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") +ENDIF () + IF (TD_ARM_64) ADD_DEFINITIONS(-D_TD_ARM_64_) SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") @@ -49,23 +66,6 @@ IF (TD_MIPS_32) SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") ENDIF () -IF (TD_LINUX_64) - ADD_DEFINITIONS(-D_M_X64) - ADD_DEFINITIONS(-D_TD_LINUX_64) - SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") - - FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/) - IF (ICONV_INCLUDE_EXIST) - ADD_DEFINITIONS(-DUSE_LIBICONV) - ENDIF () -ENDIF () - -IF (TD_LINUX_32) - ADD_DEFINITIONS(-D_TD_LINUX_32) - ADD_DEFINITIONS(-DUSE_LIBICONV) - SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -munaligned-access -fpack-struct=8 -latomic -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") -ENDIF () - IF (TD_APLHINE) SET(COMMON_FLAGS "${COMMON_FLAGS} -largp") link_libraries(/usr/lib/libargp.a) diff --git a/src/kit/taosnetwork/CMakeLists.txt b/src/kit/taosnetwork/CMakeLists.txt index a7412b196d..9d2a5ba3f8 100644 --- a/src/kit/taosnetwork/CMakeLists.txt +++ b/src/kit/taosnetwork/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) -IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) +IF (TD_LINUX) AUX_SOURCE_DIRECTORY(. SRC) ADD_EXECUTABLE(taosClient client.c) ADD_EXECUTABLE(taosServer server.c) From c9f221d04b4c2f0abf7b1e790a13e9b8905c0c49 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 7 Aug 2020 16:11:01 +0800 Subject: [PATCH 3/4] minor compile errors --- cmake/define.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/define.inc b/cmake/define.inc index f12806d6bd..73d4ccb37e 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -48,11 +48,13 @@ ENDIF () IF (TD_ARM_64) ADD_DEFINITIONS(-D_TD_ARM_64_) + ADD_DEFINITIONS(-D_TD_ARM_) SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") ENDIF () IF (TD_ARM_32) ADD_DEFINITIONS(-D_TD_ARM_32_) + ADD_DEFINITIONS(-D_TD_ARM_) SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE") ENDIF () From 915289841875fd1e15b5c5d5d5d61acfa83c802e Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sat, 8 Aug 2020 09:38:01 +0800 Subject: [PATCH 4/4] minor changes --- tests/script/sh/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 841dfcce95..498f536726 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -137,7 +137,7 @@ echo "numOfLogLines 20000000" >> $TAOS_CFG echo "mnodeEqualVnodeNum 0" >> $TAOS_CFG echo "clog 2" >> $TAOS_CFG #echo "cache 1" >> $TAOS_CFG -#echo "block 2" >> $TAOS_CFG +echo "days 10" >> $TAOS_CFG echo "statusInterval 1" >> $TAOS_CFG echo "maxVgroupsPerDb 4" >> $TAOS_CFG echo "minTablesPerVnode 4" >> $TAOS_CFG