Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
794fd7ec
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看板
提交
794fd7ec
编写于
11月 11, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "fix: set connect socket to unblocking call with timeout"
This reverts commit
14a57d9b
.
上级
9b0fa37e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
5 addition
and
43 deletion
+5
-43
deps/jemalloc
deps/jemalloc
+1
-1
src/connector/go
src/connector/go
+1
-1
src/connector/hivemq-tdengine-extension
src/connector/hivemq-tdengine-extension
+1
-1
src/kit/taos-tools
src/kit/taos-tools
+1
-1
src/plugins/taosadapter
src/plugins/taosadapter
+1
-1
src/util/src/tsocket.c
src/util/src/tsocket.c
+0
-38
未找到文件。
jemalloc
@
ea6b3e97
比较
54eaed1d
...
ea6b3e97
Subproject commit
54eaed1d8b56b1aa528be3bdd1877e59c56fa90c
Subproject commit
ea6b3e973b477b8061e0076bb257dbd7f3faa756
go
@
7da3cc9e
比较
5afdb169
...
7da3cc9e
Subproject commit
5afdb16902d507064deb79a5c0b87d7c9ef6ff3d
Subproject commit
7da3cc9e4ad1030c2eec250b869a8fa215b4a4b4
hivemq-tdengine-extension
@
82fae157
比较
af97c275
...
82fae157
Subproject commit
af97c27502269351dc9b5119c882720788f69687
Subproject commit
82fae157e23f0fb1b05d9e4664c842bc5c8211b8
taos-tools
@
23e2b73f
比较
a80b1a7c
...
23e2b73f
Subproject commit
a80b1a7c6a741502988a0930d40fa82bddd39346
Subproject commit
23e2b73fb2fba1a718f31c95513dbabeed21220a
taosadapter
@
1794a801
比较
ac79ade2
...
1794a801
Subproject commit
ac79ade213e8efd2c699560625ca0eaee116cef1
Subproject commit
1794a8019c1fa3e601e2c89b64582c8fdc59a27f
src/util/src/tsocket.c
浏览文件 @
794fd7ec
...
...
@@ -386,44 +386,6 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
}
}
taosSetNonblocking
(
sockFd
,
0
);
#elif _TD_WINDOWS
taosSetNonblocking
(
sockFd
,
1
);
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
if
(
ret
==
-
1
)
{
if
(
errno
==
EHOSTUNREACH
)
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(%s)"
,
destIp
,
destPort
,
strerror
(
errno
));
taosCloseSocket
(
sockFd
);
return
-
1
;
}
else
if
(
errno
==
EINPROGRESS
||
errno
==
EAGAIN
||
errno
==
EWOULDBLOCK
)
{
timeval
timeout
;
fd_set
set
;
timeout
.
tv_sec
=
0
;
timeout
.
tv_usec
=
tsTcpConnTimeout
*
1000
;
FD_ZERO
(
&
set
);
FD_SET
(
sockFd
,
&
set
);
if
(
select
(
sockFd
+
1
,
NULL
,
&
set
,
NULL
,
&
timeout
)
<=
0
)
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(poll error/conn timeout)"
,
destIp
,
destPort
);
taosCloseSocket
(
sockFd
);
//
return
-
1
;
}
int
optVal
=
-
1
,
optLen
=
sizeof
(
int
);
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
);
taosCloseSocket
(
sockFd
);
//
return
-
1
;
}
ret
=
0
;
}
else
{
uError
(
"failed to connect socket, ip:0x%x, port:%hu(target host cannot be reached)"
,
destIp
,
destPort
);
taosCloseSocket
(
sockFd
);
//
return
-
1
;
}
}
taosSetNonblocking
(
sockFd
,
0
);
#else
ret
=
connect
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAddr
,
sizeof
(
serverAddr
));
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录