Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9b0fa37e
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看板
提交
9b0fa37e
编写于
11月 11, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: set connect socket to unblocking call with timeout
TS-2020
上级
14a57d9b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
src/util/src/tsocket.c
src/util/src/tsocket.c
+14
-14
未找到文件。
src/util/src/tsocket.c
浏览文件 @
9b0fa37e
...
@@ -352,40 +352,40 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
...
@@ -352,40 +352,40 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
serverAddr
.
sin_addr
.
s_addr
=
destIp
;
serverAddr
.
sin_addr
.
s_addr
=
destIp
;
serverAddr
.
sin_port
=
(
uint16_t
)
htons
((
uint16_t
)
destPort
);
serverAddr
.
sin_port
=
(
uint16_t
)
htons
((
uint16_t
)
destPort
);
#ifdef _TD_LINUX
#ifdef _TD_LINUX
taosSetNonblocking
(
sockFd
,
1
);
taosSetNonblocking
(
sockFd
,
1
);
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
if
(
errno
==
EHOSTUNREACH
)
{
if
(
errno
==
EHOSTUNREACH
)
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(%s)"
,
destIp
,
destPort
,
strerror
(
errno
));
uError
(
"failed to connect socket, ip:0x%x, port:%hu(%s)"
,
destIp
,
destPort
,
strerror
(
errno
));
taosCloseSocket
(
sockFd
);
taosCloseSocket
(
sockFd
);
return
-
1
;
return
-
1
;
}
else
if
(
errno
==
EINPROGRESS
||
errno
==
EAGAIN
||
errno
==
EWOULDBLOCK
)
{
}
else
if
(
errno
==
EINPROGRESS
||
errno
==
EAGAIN
||
errno
==
EWOULDBLOCK
)
{
struct
pollfd
wfd
[
1
];
struct
pollfd
wfd
[
1
];
wfd
[
0
].
fd
=
sockFd
;
wfd
[
0
].
fd
=
sockFd
;
wfd
[
0
].
events
=
POLLOUT
;
wfd
[
0
].
events
=
POLLOUT
;
int
res
=
poll
(
wfd
,
1
,
tsTcpConnTimeout
);
int
res
=
poll
(
wfd
,
1
,
tsTcpConnTimeout
);
if
(
res
==
-
1
||
res
==
0
)
{
if
(
res
==
-
1
||
res
==
0
)
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(poll error/conn timeout)"
,
destIp
,
destPort
);
uError
(
"failed to connect socket, ip:0x%x, port:%hu(poll error/conn timeout)"
,
destIp
,
destPort
);
taosCloseSocket
(
sockFd
);
//
taosCloseSocket
(
sockFd
);
//
return
-
1
;
return
-
1
;
}
}
int
optVal
=
-
1
,
optLen
=
sizeof
(
int
);
int
optVal
=
-
1
,
optLen
=
sizeof
(
int
);
if
((
0
!=
taosGetSockOpt
(
sockFd
,
SOL_SOCKET
,
SO_ERROR
,
&
optVal
,
&
optLen
))
||
(
optVal
!=
0
))
{
if
((
0
!=
taosGetSockOpt
(
sockFd
,
SOL_SOCKET
,
SO_ERROR
,
&
optVal
,
&
optLen
))
||
(
optVal
!=
0
))
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(connect host error)"
,
destIp
,
destPort
);
uError
(
"failed to connect socket, ip:0x%x, port:%hu(connect host error)"
,
destIp
,
destPort
);
taosCloseSocket
(
sockFd
);
//
taosCloseSocket
(
sockFd
);
//
return
-
1
;
return
-
1
;
}
}
ret
=
0
;
ret
=
0
;
}
else
{
// Other error
}
else
{
// Other error
uError
(
"failed to connect socket, ip:0x%x, port:%hu(target host cannot be reached)"
,
destIp
,
destPort
);
uError
(
"failed to connect socket, ip:0x%x, port:%hu(target host cannot be reached)"
,
destIp
,
destPort
);
taosCloseSocket
(
sockFd
);
//
taosCloseSocket
(
sockFd
);
//
return
-
1
;
return
-
1
;
}
}
}
}
taosSetNonblocking
(
sockFd
,
0
);
taosSetNonblocking
(
sockFd
,
0
);
#elif _TD_WINDOWS
#elif _TD_WINDOWS
taosSetNonblocking
(
sockFd
,
1
);
taosSetNonblocking
(
sockFd
,
1
);
...
@@ -425,7 +425,7 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
...
@@ -425,7 +425,7 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
}
}
taosSetNonblocking
(
sockFd
,
0
);
taosSetNonblocking
(
sockFd
,
0
);
#else
#else
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
#endif
#endif
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录