Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
04be84f9
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
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看板
提交
04be84f9
编写于
12月 23, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-12461]<fix>: Potential monitor crash when saving master uptime info into log database
上级
00d10400
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
45 addition
and
8 deletion
+45
-8
src/plugins/monitor/src/monMain.c
src/plugins/monitor/src/monMain.c
+45
-8
未找到文件。
src/plugins/monitor/src/monMain.c
浏览文件 @
04be84f9
...
...
@@ -601,6 +601,9 @@ static void monSaveSystemInfo() {
}
static
int32_t
monGetRowElemCharLen
(
TAOS_FIELD
field
,
char
*
rowElem
)
{
if
(
field
.
type
!=
TSDB_DATA_TYPE_BINARY
&&
field
.
type
!=
TSDB_DATA_TYPE_NCHAR
)
{
return
-
1
;
}
int32_t
charLen
=
varDataLen
(
rowElem
-
VARSTR_HEADER_SIZE
);
if
(
field
.
type
==
TSDB_DATA_TYPE_BINARY
)
{
assert
(
charLen
<=
field
.
bytes
&&
charLen
>=
0
);
...
...
@@ -629,12 +632,14 @@ static int32_t monBuildMasterUptimeSql(char *sql) {
while
((
row
=
taos_fetch_row
(
result
)))
{
for
(
int
i
=
0
;
i
<
num_fields
;
++
i
)
{
int32_t
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
strcmp
(
fields
[
i
].
name
,
"role"
)
==
0
&&
strncmp
((
char
*
)
row
[
i
],
"master"
,
charLen
)
==
0
)
{
if
(
strcmp
(
fields
[
i
+
1
].
name
,
"role_time"
)
==
0
)
{
int64_t
now
=
taosGetTimestamp
(
TSDB_TIME_PRECISION_MILLI
);
//master uptime in seconds
masterUptime
=
(
now
-
*
(
int64_t
*
)
row
[
i
+
1
])
/
1000
;
if
(
strcmp
(
fields
[
i
].
name
,
"role"
)
==
0
)
{
int32_t
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
strncmp
((
char
*
)
row
[
i
],
"master"
,
charLen
)
==
0
)
{
if
(
strcmp
(
fields
[
i
+
1
].
name
,
"role_time"
)
==
0
)
{
int64_t
now
=
taosGetTimestamp
(
TSDB_TIME_PRECISION_MILLI
);
//master uptime in seconds
masterUptime
=
(
now
-
*
(
int64_t
*
)
row
[
i
+
1
])
/
1000
;
}
}
}
}
...
...
@@ -1139,12 +1144,16 @@ static uint32_t monBuildVgroupsInfoSql(char *sql, char *dbName) {
pos
+=
snprintf
(
sql
,
SQL_LENGTH
,
"insert into %s.vgroup_%d values(%"
PRId64
", "
SQL_STR_FMT
,
tsMonitorDbName
,
vgId
,
ts
,
dbName
);
}
else
{
return
TSDB_CODE_SUCCESS
;
goto
DONE
;
}
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"tables"
)
==
0
)
{
pos
+=
snprintf
(
sql
+
pos
,
SQL_LENGTH
,
", %d"
,
*
(
int32_t
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"status"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save vgroup_%d info, reason: invalid row %s len, sql:%s"
,
vgId
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
1
,
", "
SQL_STR_FMT
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"onlines"
)
==
0
)
{
pos
+=
snprintf
(
sql
+
pos
,
SQL_LENGTH
,
", %d"
,
*
(
int32_t
*
)
row
[
i
]);
...
...
@@ -1152,6 +1161,10 @@ static uint32_t monBuildVgroupsInfoSql(char *sql, char *dbName) {
snprintf
(
v_dnode_ids
,
sizeof
(
v_dnode_ids
),
"%d;"
,
*
(
int16_t
*
)
row
[
i
]);
}
else
if
(
v_dnode_str
&&
strcmp
(
v_dnode_str
,
"_status"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save vgroup_%d info, reason: invalid row %s len, sql:%s"
,
vgId
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
snprintf
(
v_dnode_status
,
charLen
+
1
,
"%s;"
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"compacting"
)
==
0
)
{
//flush dnode_ids and dnode_role in to sql
...
...
@@ -1169,6 +1182,8 @@ static uint32_t monBuildVgroupsInfoSql(char *sql, char *dbName) {
monDebug
(
"successfully to save vgroup_%d info, sql:%s"
,
vgId
,
tsMonitor
.
sql
);
}
}
DONE:
taos_free_result
(
result
);
return
TSDB_CODE_SUCCESS
;
...
...
@@ -1220,12 +1235,24 @@ static void monSaveSlowQueryInfo() {
if
(
strcmp
(
fields
[
i
].
name
,
"query_id"
)
==
0
)
{
has_slowquery
=
true
;
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save slow_query info, reason: invalid row %s len, sql:%s"
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
1
,
", "
SQL_STR_FMT
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"user"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save slow_query info, reason: invalid row %s len, sql:%s"
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
1
,
", "
SQL_STR_FMT
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"qid"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save slow_query info, reason: invalid row %s len, sql:%s"
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
1
,
", "
SQL_STR_FMT
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"created_time"
)
==
0
)
{
int64_t
create_time
=
*
(
int64_t
*
)
row
[
i
];
...
...
@@ -1235,16 +1262,23 @@ static void monSaveSlowQueryInfo() {
pos
+=
snprintf
(
sql
+
pos
,
SQL_LENGTH
,
", %"
PRId64
""
,
*
(
int64_t
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"ep"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save slow_query info, reason: invalid row %s len, sql:%s"
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
1
,
", "
SQL_STR_FMT
,
(
char
*
)
row
[
i
]);
}
else
if
(
strcmp
(
fields
[
i
].
name
,
"sql"
)
==
0
)
{
charLen
=
monGetRowElemCharLen
(
fields
[
i
],
(
char
*
)
row
[
i
]);
if
(
charLen
<
0
)
{
monError
(
"failed to save slow_query info, reason: invalid row %s len, sql:%s"
,
(
char
*
)
row
[
i
],
tsMonitor
.
sql
);
goto
DONE
;
}
pos
+=
snprintf
(
sql
+
pos
,
strlen
(
SQL_STR_FMT
)
+
charLen
+
2
,
", "
SQL_STR_FMT
")"
,
(
char
*
)
row
[
i
]);
}
}
}
monDebug
(
"save slow query, sql:%s"
,
sql
);
taos_free_result
(
result
);
if
(
!
has_slowquery
)
{
return
;
}
...
...
@@ -1259,6 +1293,9 @@ static void monSaveSlowQueryInfo() {
monDebug
(
"successfully to save slowquery info, sql:%s"
,
tsMonitor
.
sql
);
}
DONE:
taos_free_result
(
result
);
return
;
}
static
void
monSaveDisksInfo
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录