Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
27643f7c
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看板
提交
27643f7c
编写于
2月 16, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix invalid read
上级
792e16be
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
8 deletion
+20
-8
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+20
-8
未找到文件。
source/libs/transport/src/transCli.c
浏览文件 @
27643f7c
...
...
@@ -158,6 +158,7 @@ static void cliHandleResp(SCliConn* conn);
// handle except about conn
static
void
cliHandleExcept
(
SCliConn
*
conn
);
static
void
cliReleaseUnfinishedMsg
(
SCliConn
*
conn
);
static
void
cliHandleFastFail
(
SCliConn
*
pConn
,
int
status
);
// handle req from app
static
void
cliHandleReq
(
SCliMsg
*
pMsg
,
SCliThrd
*
pThrd
);
...
...
@@ -488,9 +489,9 @@ void cliConnTimeout(uv_timer_t* handle) {
uv_timer_stop
(
handle
);
handle
->
data
=
NULL
;
taosArrayPush
(
pThrd
->
timerList
,
&
conn
->
timer
);
conn
->
timer
=
NULL
;
cliHandleExceptImpl
(
conn
,
-
1
);
cliHandleFastFail
(
conn
,
UV_ECANCELED
);
}
void
cliReadTimeoutCb
(
uv_timer_t
*
handle
)
{
// set up timeout cb
...
...
@@ -897,11 +898,6 @@ static void cliHandleFastFail(SCliConn* pConn, int status) {
tGError
(
"%s msg %s failed to send, conn %p failed to connect to %s, reason: %s"
,
CONN_GET_INST_LABEL
(
pConn
),
TMSG_INFO
(
pMsg
->
msg
.
msgType
),
pConn
,
pConn
->
ip
,
uv_strerror
(
status
));
uv_timer_stop
(
pConn
->
timer
);
pConn
->
timer
->
data
=
NULL
;
taosArrayPush
(
pThrd
->
timerList
,
&
pConn
->
timer
);
pConn
->
timer
=
NULL
;
if
(
pMsg
!=
NULL
&&
REQUEST_NO_RESP
(
&
pMsg
->
msg
)
&&
(
pTransInst
->
failFastFp
!=
NULL
&&
pTransInst
->
failFastFp
(
pMsg
->
msg
.
msgType
)))
{
SFailFastItem
*
item
=
taosHashGet
(
pThrd
->
failFastCache
,
pConn
->
ip
,
strlen
(
pConn
->
ip
));
...
...
@@ -921,12 +917,23 @@ static void cliHandleFastFail(SCliConn* pConn, int status) {
}
cliHandleExcept
(
pConn
);
}
void
cliConnCb
(
uv_connect_t
*
req
,
int
status
)
{
SCliConn
*
pConn
=
req
->
data
;
SCliThrd
*
pThrd
=
pConn
->
hostThrd
;
bool
timeout
=
false
;
if
(
pConn
->
timer
==
NULL
)
{
timeout
=
true
;
}
else
{
uv_timer_stop
(
pConn
->
timer
);
pConn
->
timer
->
data
=
NULL
;
taosArrayPush
(
pThrd
->
timerList
,
&
pConn
->
timer
);
pConn
->
timer
=
NULL
;
}
if
(
status
!=
0
)
{
cliHandleFastFail
(
pConn
,
status
);
if
(
timeout
==
false
)
cliHandleFastFail
(
pConn
,
status
);
return
;
}
...
...
@@ -1199,6 +1206,11 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrd* pThrd) {
ret
=
uv_tcp_connect
(
&
conn
->
connReq
,
(
uv_tcp_t
*
)(
conn
->
stream
),
(
const
struct
sockaddr
*
)
&
addr
,
cliConnCb
);
if
(
ret
!=
0
)
{
uv_timer_stop
(
conn
->
timer
);
conn
->
timer
->
data
=
NULL
;
taosArrayPush
(
pThrd
->
timerList
,
&
conn
->
timer
);
conn
->
timer
=
NULL
;
cliHandleFastFail
(
conn
,
ret
);
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录