Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4f86c27b
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1181
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4f86c27b
编写于
10月 27, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
10月 27, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17688 from taosdata/feature/sync2-merge
refactor(sync): check pSyncTimer NULL
上级
0abf3af5
913517f0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
14 deletion
+18
-14
include/libs/sync/sync.h
include/libs/sync/sync.h
+1
-1
include/util/tdef.h
include/util/tdef.h
+8
-8
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+6
-2
tests/script/tsim/db/alter_option.sim
tests/script/tsim/db/alter_option.sim
+3
-3
未找到文件。
include/libs/sync/sync.h
浏览文件 @
4f86c27b
...
@@ -38,7 +38,7 @@ extern bool gRaftDetailLog;
...
@@ -38,7 +38,7 @@ extern bool gRaftDetailLog;
#define SYNC_DEL_WAL_MS (1000 * 60)
#define SYNC_DEL_WAL_MS (1000 * 60)
#define SYNC_ADD_QUORUM_COUNT 3
#define SYNC_ADD_QUORUM_COUNT 3
#define SYNC_MNODE_LOG_RETENTION 10000
#define SYNC_MNODE_LOG_RETENTION 10000
#define SYNC_VNODE_LOG_RETENTION
5
00
#define SYNC_VNODE_LOG_RETENTION
1
00
#define SYNC_APPEND_ENTRIES_TIMEOUT_MS 10000
#define SYNC_APPEND_ENTRIES_TIMEOUT_MS 10000
...
...
include/util/tdef.h
浏览文件 @
4f86c27b
...
@@ -234,9 +234,9 @@ typedef enum ELogicConditionType {
...
@@ -234,9 +234,9 @@ typedef enum ELogicConditionType {
* - Secondly, if all cols are VarDataT type except primary key, we need 4 bits to store the offset, thus
* - Secondly, if all cols are VarDataT type except primary key, we need 4 bits to store the offset, thus
* the final value is 65531-(4096-1)*4 = 49151.
* the final value is 65531-(4096-1)*4 = 49151.
*/
*/
#define TSDB_MAX_BYTES_PER_ROW
49151
#define TSDB_MAX_BYTES_PER_ROW 49151
#define TSDB_MAX_TAGS_LEN
16384
#define TSDB_MAX_TAGS_LEN 16384
#define TSDB_MAX_TAGS
128
#define TSDB_MAX_TAGS 128
#define TSDB_MAX_COL_TAG_NUM (TSDB_MAX_COLUMNS + TSDB_MAX_TAGS)
#define TSDB_MAX_COL_TAG_NUM (TSDB_MAX_COLUMNS + TSDB_MAX_TAGS)
#define TSDB_MAX_JSON_TAG_LEN 16384
#define TSDB_MAX_JSON_TAG_LEN 16384
...
@@ -370,13 +370,13 @@ typedef enum ELogicConditionType {
...
@@ -370,13 +370,13 @@ typedef enum ELogicConditionType {
#define TSDB_DB_MIN_WAL_RETENTION_PERIOD -1
#define TSDB_DB_MIN_WAL_RETENTION_PERIOD -1
#define TSDB_REP_DEF_DB_WAL_RET_PERIOD 0
#define TSDB_REP_DEF_DB_WAL_RET_PERIOD 0
#define TSDB_REPS_DEF_DB_WAL_RET_PERIOD
(24 * 60 * 60 * 4)
#define TSDB_REPS_DEF_DB_WAL_RET_PERIOD
0
#define TSDB_DB_MIN_WAL_RETENTION_SIZE -1
#define TSDB_DB_MIN_WAL_RETENTION_SIZE -1
#define TSDB_REP_DEF_DB_WAL_RET_SIZE 0
#define TSDB_REP_DEF_DB_WAL_RET_SIZE 0
#define TSDB_REPS_DEF_DB_WAL_RET_SIZE
-1
#define TSDB_REPS_DEF_DB_WAL_RET_SIZE
0
#define TSDB_DB_MIN_WAL_ROLL_PERIOD 0
#define TSDB_DB_MIN_WAL_ROLL_PERIOD 0
#define TSDB_REP_DEF_DB_WAL_ROLL_PERIOD 0
#define TSDB_REP_DEF_DB_WAL_ROLL_PERIOD 0
#define TSDB_REPS_DEF_DB_WAL_ROLL_PERIOD
(24 * 60 * 60 * 1)
#define TSDB_REPS_DEF_DB_WAL_ROLL_PERIOD
0
#define TSDB_DB_MIN_WAL_SEGMENT_SIZE 0
#define TSDB_DB_MIN_WAL_SEGMENT_SIZE 0
#define TSDB_DEFAULT_DB_WAL_SEGMENT_SIZE 0
#define TSDB_DEFAULT_DB_WAL_SEGMENT_SIZE 0
...
@@ -409,7 +409,7 @@ typedef enum ELogicConditionType {
...
@@ -409,7 +409,7 @@ typedef enum ELogicConditionType {
#define TSDB_MAX_RPC_THREADS 10
#define TSDB_MAX_RPC_THREADS 10
#endif
#endif
#define TSDB_QUERY_TYPE_NON_TYPE
0x00u // none type
#define TSDB_QUERY_TYPE_NON_TYPE 0x00u // none type
#define TSDB_META_COMPACT_RATIO 0 // disable tsdb meta compact by default
#define TSDB_META_COMPACT_RATIO 0 // disable tsdb meta compact by default
...
@@ -486,7 +486,7 @@ enum {
...
@@ -486,7 +486,7 @@ enum {
#define MAX_NUM_STR_SIZE 40
#define MAX_NUM_STR_SIZE 40
#define MAX_META_MSG_IN_BATCH 1048576
#define MAX_META_MSG_IN_BATCH
1048576
#define MAX_META_BATCH_RSP_SIZE (1 * 1048576 * 1024)
#define MAX_META_BATCH_RSP_SIZE (1 * 1048576 * 1024)
#ifdef __cplusplus
#ifdef __cplusplus
...
...
source/libs/sync/src/syncMain.c
浏览文件 @
4f86c27b
...
@@ -1645,7 +1645,9 @@ int32_t syncNodeStartHeartbeatTimer(SSyncNode* pSyncNode) {
...
@@ -1645,7 +1645,9 @@ int32_t syncNodeStartHeartbeatTimer(SSyncNode* pSyncNode) {
for
(
int
i
=
0
;
i
<
pSyncNode
->
peersNum
;
++
i
)
{
for
(
int
i
=
0
;
i
<
pSyncNode
->
peersNum
;
++
i
)
{
SSyncTimer
*
pSyncTimer
=
syncNodeGetHbTimer
(
pSyncNode
,
&
(
pSyncNode
->
peersId
[
i
]));
SSyncTimer
*
pSyncTimer
=
syncNodeGetHbTimer
(
pSyncNode
,
&
(
pSyncNode
->
peersId
[
i
]));
syncHbTimerStart
(
pSyncNode
,
pSyncTimer
);
if
(
pSyncTimer
!=
NULL
)
{
syncHbTimerStart
(
pSyncNode
,
pSyncTimer
);
}
}
}
return
ret
;
return
ret
;
...
@@ -1662,7 +1664,9 @@ int32_t syncNodeStopHeartbeatTimer(SSyncNode* pSyncNode) {
...
@@ -1662,7 +1664,9 @@ int32_t syncNodeStopHeartbeatTimer(SSyncNode* pSyncNode) {
for
(
int
i
=
0
;
i
<
pSyncNode
->
peersNum
;
++
i
)
{
for
(
int
i
=
0
;
i
<
pSyncNode
->
peersNum
;
++
i
)
{
SSyncTimer
*
pSyncTimer
=
syncNodeGetHbTimer
(
pSyncNode
,
&
(
pSyncNode
->
peersId
[
i
]));
SSyncTimer
*
pSyncTimer
=
syncNodeGetHbTimer
(
pSyncNode
,
&
(
pSyncNode
->
peersId
[
i
]));
syncHbTimerStop
(
pSyncNode
,
pSyncTimer
);
if
(
pSyncTimer
!=
NULL
)
{
syncHbTimerStop
(
pSyncNode
,
pSyncTimer
);
}
}
}
return
ret
;
return
ret
;
...
...
tests/script/tsim/db/alter_option.sim
浏览文件 @
4f86c27b
...
@@ -111,13 +111,13 @@ endi
...
@@ -111,13 +111,13 @@ endi
if $data21_db != 1000 then # wal_level fsyncperiod
if $data21_db != 1000 then # wal_level fsyncperiod
return -1
return -1
endi
endi
if $data22_db !=
34560
0 then # wal_retention_period
if $data22_db != 0 then # wal_retention_period
return -1
return -1
endi
endi
if $data23_db !=
-1
then # wal_retention_size
if $data23_db !=
0
then # wal_retention_size
return -1
return -1
endi
endi
if $data24_db !=
8640
0 then # wal_roll_period
if $data24_db != 0 then # wal_roll_period
return -1
return -1
endi
endi
if $data25_db != 0 then # wal_segment_size
if $data25_db != 0 then # wal_segment_size
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录