Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
fb226c2c
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
fb226c2c
编写于
7月 20, 2023
作者:
S
Shungang Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: check cluster ttlChangeOnWrite consistency
上级
a72c11c8
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
17 addition
and
0 deletion
+17
-0
include/common/tmsg.h
include/common/tmsg.h
+1
-0
source/common/src/tmsg.c
source/common/src/tmsg.c
+7
-0
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+1
-0
source/dnode/mnode/impl/inc/mndDef.h
source/dnode/mnode/impl/inc/mndDef.h
+1
-0
source/dnode/mnode/impl/src/mndDnode.c
source/dnode/mnode/impl/src/mndDnode.c
+7
-0
未找到文件。
include/common/tmsg.h
浏览文件 @
fb226c2c
...
@@ -1144,6 +1144,7 @@ typedef struct {
...
@@ -1144,6 +1144,7 @@ typedef struct {
char
timezone
[
TD_TIMEZONE_LEN
];
// tsTimezone
char
timezone
[
TD_TIMEZONE_LEN
];
// tsTimezone
char
locale
[
TD_LOCALE_LEN
];
// tsLocale
char
locale
[
TD_LOCALE_LEN
];
// tsLocale
char
charset
[
TD_LOCALE_LEN
];
// tsCharset
char
charset
[
TD_LOCALE_LEN
];
// tsCharset
int8_t
ttlChangeOnWrite
;
}
SClusterCfg
;
}
SClusterCfg
;
typedef
struct
{
typedef
struct
{
...
...
source/common/src/tmsg.c
浏览文件 @
fb226c2c
...
@@ -1103,6 +1103,7 @@ int32_t tSerializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
...
@@ -1103,6 +1103,7 @@ int32_t tSerializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
if
(
tEncodeI32
(
&
encoder
,
pReq
->
statusSeq
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
&
encoder
,
pReq
->
statusSeq
)
<
0
)
return
-
1
;
if
(
tEncodeI64
(
&
encoder
,
pReq
->
mload
.
syncTerm
)
<
0
)
return
-
1
;
if
(
tEncodeI64
(
&
encoder
,
pReq
->
mload
.
syncTerm
)
<
0
)
return
-
1
;
if
(
tEncodeI64
(
&
encoder
,
pReq
->
mload
.
roleTimeMs
)
<
0
)
return
-
1
;
if
(
tEncodeI64
(
&
encoder
,
pReq
->
mload
.
roleTimeMs
)
<
0
)
return
-
1
;
if
(
tEncodeI8
(
&
encoder
,
pReq
->
clusterCfg
.
ttlChangeOnWrite
)
<
0
)
return
-
1
;
tEndEncode
(
&
encoder
);
tEndEncode
(
&
encoder
);
int32_t
tlen
=
encoder
.
pos
;
int32_t
tlen
=
encoder
.
pos
;
...
@@ -1192,6 +1193,12 @@ int32_t tDeserializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
...
@@ -1192,6 +1193,12 @@ int32_t tDeserializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
if
(
tDecodeI64
(
&
decoder
,
&
pReq
->
mload
.
syncTerm
)
<
0
)
return
-
1
;
if
(
tDecodeI64
(
&
decoder
,
&
pReq
->
mload
.
syncTerm
)
<
0
)
return
-
1
;
if
(
tDecodeI64
(
&
decoder
,
&
pReq
->
mload
.
roleTimeMs
)
<
0
)
return
-
1
;
if
(
tDecodeI64
(
&
decoder
,
&
pReq
->
mload
.
roleTimeMs
)
<
0
)
return
-
1
;
}
}
pReq
->
clusterCfg
.
ttlChangeOnWrite
=
false
;
if
(
!
tDecodeIsEnd
(
&
decoder
))
{
if
(
tDecodeI8
(
&
decoder
,
&
pReq
->
clusterCfg
.
ttlChangeOnWrite
)
<
0
)
return
-
1
;
}
tEndDecode
(
&
decoder
);
tEndDecode
(
&
decoder
);
tDecoderClear
(
&
decoder
);
tDecoderClear
(
&
decoder
);
return
0
;
return
0
;
...
...
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
浏览文件 @
fb226c2c
...
@@ -90,6 +90,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
...
@@ -90,6 +90,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
req
.
clusterCfg
.
statusInterval
=
tsStatusInterval
;
req
.
clusterCfg
.
statusInterval
=
tsStatusInterval
;
req
.
clusterCfg
.
checkTime
=
0
;
req
.
clusterCfg
.
checkTime
=
0
;
req
.
clusterCfg
.
ttlChangeOnWrite
=
tsTtlChangeOnWrite
;
char
timestr
[
32
]
=
"1970-01-01 00:00:00.00"
;
char
timestr
[
32
]
=
"1970-01-01 00:00:00.00"
;
(
void
)
taosParseTime
(
timestr
,
&
req
.
clusterCfg
.
checkTime
,
(
int32_t
)
strlen
(
timestr
),
TSDB_TIME_PRECISION_MILLI
,
0
);
(
void
)
taosParseTime
(
timestr
,
&
req
.
clusterCfg
.
checkTime
,
(
int32_t
)
strlen
(
timestr
),
TSDB_TIME_PRECISION_MILLI
,
0
);
memcpy
(
req
.
clusterCfg
.
timezone
,
tsTimezoneStr
,
TD_TIMEZONE_LEN
);
memcpy
(
req
.
clusterCfg
.
timezone
,
tsTimezoneStr
,
TD_TIMEZONE_LEN
);
...
...
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @
fb226c2c
...
@@ -133,6 +133,7 @@ typedef enum {
...
@@ -133,6 +133,7 @@ typedef enum {
DND_REASON_TIME_ZONE_NOT_MATCH
,
DND_REASON_TIME_ZONE_NOT_MATCH
,
DND_REASON_LOCALE_NOT_MATCH
,
DND_REASON_LOCALE_NOT_MATCH
,
DND_REASON_CHARSET_NOT_MATCH
,
DND_REASON_CHARSET_NOT_MATCH
,
DND_REASON_TTL_CHANGE_ON_WRITE_NOT_MATCH
,
DND_REASON_OTHERS
DND_REASON_OTHERS
}
EDndReason
;
}
EDndReason
;
...
...
source/dnode/mnode/impl/src/mndDnode.c
浏览文件 @
fb226c2c
...
@@ -41,6 +41,7 @@ static const char *offlineReason[] = {
...
@@ -41,6 +41,7 @@ static const char *offlineReason[] = {
"timezone not match"
,
"timezone not match"
,
"locale not match"
,
"locale not match"
,
"charset not match"
,
"charset not match"
,
"ttl change on write not match"
"unknown"
,
"unknown"
,
};
};
...
@@ -414,6 +415,12 @@ static int32_t mndCheckClusterCfgPara(SMnode *pMnode, SDnodeObj *pDnode, const S
...
@@ -414,6 +415,12 @@ static int32_t mndCheckClusterCfgPara(SMnode *pMnode, SDnodeObj *pDnode, const S
return
DND_REASON_CHARSET_NOT_MATCH
;
return
DND_REASON_CHARSET_NOT_MATCH
;
}
}
if
(
pCfg
->
ttlChangeOnWrite
!=
tsTtlChangeOnWrite
)
{
mError
(
"dnode:%d, ttlChangeOnWrite:%d inconsistent with cluster:%d"
,
pDnode
->
id
,
pCfg
->
ttlChangeOnWrite
,
tsTtlChangeOnWrite
);
return
DND_REASON_TTL_CHANGE_ON_WRITE_NOT_MATCH
;
}
return
0
;
return
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录