Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
e44704b2
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
Star
22018
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看板
提交
e44704b2
编写于
2月 15, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
opt: opt tag index
上级
009b6a61
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
1 deletion
+25
-1
include/libs/transport/trpc.h
include/libs/transport/trpc.h
+2
-0
source/dnode/mgmt/node_mgmt/src/dmTransport.c
source/dnode/mgmt/node_mgmt/src/dmTransport.c
+2
-0
source/libs/transport/inc/transportInt.h
source/libs/transport/inc/transportInt.h
+1
-0
source/libs/transport/src/trans.c
source/libs/transport/src/trans.c
+1
-0
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+18
-1
source/util/src/terror.c
source/util/src/terror.c
+1
-0
未找到文件。
include/libs/transport/trpc.h
浏览文件 @
e44704b2
...
@@ -112,6 +112,8 @@ typedef struct SRpcInit {
...
@@ -112,6 +112,8 @@ typedef struct SRpcInit {
// fail fast fp
// fail fast fp
RpcFFfp
ffp
;
RpcFFfp
ffp
;
int32_t
connLimit
;
void
*
parent
;
void
*
parent
;
}
SRpcInit
;
}
SRpcInit
;
...
...
source/dnode/mgmt/node_mgmt/src/dmTransport.c
浏览文件 @
e44704b2
...
@@ -284,6 +284,8 @@ int32_t dmInitClient(SDnode *pDnode) {
...
@@ -284,6 +284,8 @@ int32_t dmInitClient(SDnode *pDnode) {
rpcInit
.
failFastThreshold
=
3
;
// failed threshold
rpcInit
.
failFastThreshold
=
3
;
// failed threshold
rpcInit
.
ffp
=
dmFailFastFp
;
rpcInit
.
ffp
=
dmFailFastFp
;
rpcInit
.
connLimit
=
7500
;
pTrans
->
clientRpc
=
rpcOpen
(
&
rpcInit
);
pTrans
->
clientRpc
=
rpcOpen
(
&
rpcInit
);
if
(
pTrans
->
clientRpc
==
NULL
)
{
if
(
pTrans
->
clientRpc
==
NULL
)
{
dError
(
"failed to init dnode rpc client"
);
dError
(
"failed to init dnode rpc client"
);
...
...
source/libs/transport/inc/transportInt.h
浏览文件 @
e44704b2
...
@@ -64,6 +64,7 @@ typedef struct {
...
@@ -64,6 +64,7 @@ typedef struct {
void
(
*
destroyFp
)(
void
*
ahandle
);
void
(
*
destroyFp
)(
void
*
ahandle
);
bool
(
*
failFastFp
)(
tmsg_t
msgType
);
bool
(
*
failFastFp
)(
tmsg_t
msgType
);
int32_t
connLimit
;
int
index
;
int
index
;
void
*
parent
;
void
*
parent
;
void
*
tcphandle
;
// returned handle from TCP initialization
void
*
tcphandle
;
// returned handle from TCP initialization
...
...
source/libs/transport/src/trans.c
浏览文件 @
e44704b2
...
@@ -67,6 +67,7 @@ void* rpcOpen(const SRpcInit* pInit) {
...
@@ -67,6 +67,7 @@ void* rpcOpen(const SRpcInit* pInit) {
pRpc
->
startTimer
=
pInit
->
tfp
;
pRpc
->
startTimer
=
pInit
->
tfp
;
pRpc
->
destroyFp
=
pInit
->
dfp
;
pRpc
->
destroyFp
=
pInit
->
dfp
;
pRpc
->
failFastFp
=
pInit
->
ffp
;
pRpc
->
failFastFp
=
pInit
->
ffp
;
pRpc
->
connLimit
=
pInit
->
connLimit
;
pRpc
->
numOfThreads
=
pInit
->
numOfThreads
>
TSDB_MAX_RPC_THREADS
?
TSDB_MAX_RPC_THREADS
:
pInit
->
numOfThreads
;
pRpc
->
numOfThreads
=
pInit
->
numOfThreads
>
TSDB_MAX_RPC_THREADS
?
TSDB_MAX_RPC_THREADS
:
pInit
->
numOfThreads
;
if
(
pRpc
->
numOfThreads
<=
0
)
{
if
(
pRpc
->
numOfThreads
<=
0
)
{
...
...
source/libs/transport/src/transCli.c
浏览文件 @
e44704b2
...
@@ -80,6 +80,7 @@ typedef struct SCliThrd {
...
@@ -80,6 +80,7 @@ typedef struct SCliThrd {
uint64_t
nextTimeout
;
// next timeout
uint64_t
nextTimeout
;
// next timeout
void
*
pTransInst
;
//
void
*
pTransInst
;
//
int
connCount
;
void
(
*
destroyAhandleFp
)(
void
*
ahandle
);
void
(
*
destroyAhandleFp
)(
void
*
ahandle
);
SHashObj
*
fqdn2ipCache
;
SHashObj
*
fqdn2ipCache
;
SCvtAddr
cvtAddr
;
SCvtAddr
cvtAddr
;
...
@@ -671,7 +672,6 @@ static SCliConn* cliCreateConn(SCliThrd* pThrd) {
...
@@ -671,7 +672,6 @@ static SCliConn* cliCreateConn(SCliThrd* pThrd) {
conn
->
stream
=
(
uv_stream_t
*
)
taosMemoryMalloc
(
sizeof
(
uv_tcp_t
));
conn
->
stream
=
(
uv_stream_t
*
)
taosMemoryMalloc
(
sizeof
(
uv_tcp_t
));
uv_tcp_init
(
pThrd
->
loop
,
(
uv_tcp_t
*
)(
conn
->
stream
));
uv_tcp_init
(
pThrd
->
loop
,
(
uv_tcp_t
*
)(
conn
->
stream
));
conn
->
stream
->
data
=
conn
;
conn
->
stream
->
data
=
conn
;
// transSetConnOption((uv_tcp_t*)conn->stream);
uv_timer_t
*
timer
=
taosArrayGetSize
(
pThrd
->
timerList
)
>
0
?
*
(
uv_timer_t
**
)
taosArrayPop
(
pThrd
->
timerList
)
:
NULL
;
uv_timer_t
*
timer
=
taosArrayGetSize
(
pThrd
->
timerList
)
>
0
?
*
(
uv_timer_t
**
)
taosArrayPop
(
pThrd
->
timerList
)
:
NULL
;
if
(
timer
==
NULL
)
{
if
(
timer
==
NULL
)
{
...
@@ -694,6 +694,7 @@ static SCliConn* cliCreateConn(SCliThrd* pThrd) {
...
@@ -694,6 +694,7 @@ static SCliConn* cliCreateConn(SCliThrd* pThrd) {
conn
->
broken
=
0
;
conn
->
broken
=
0
;
transRefCliHandle
(
conn
);
transRefCliHandle
(
conn
);
atomic_add_fetch_32
(
&
pThrd
->
connCount
,
1
);
allocConnRef
(
conn
,
false
);
allocConnRef
(
conn
,
false
);
return
conn
;
return
conn
;
...
@@ -738,6 +739,8 @@ static void cliDestroy(uv_handle_t* handle) {
...
@@ -738,6 +739,8 @@ static void cliDestroy(uv_handle_t* handle) {
conn
->
timer
=
NULL
;
conn
->
timer
=
NULL
;
}
}
atomic_sub_fetch_32
(
&
pThrd
->
connCount
,
1
);
transReleaseExHandle
(
transGetRefMgt
(),
conn
->
refId
);
transReleaseExHandle
(
transGetRefMgt
(),
conn
->
refId
);
transRemoveExHandle
(
transGetRefMgt
(),
conn
->
refId
);
transRemoveExHandle
(
transGetRefMgt
(),
conn
->
refId
);
taosMemoryFree
(
conn
->
ip
);
taosMemoryFree
(
conn
->
ip
);
...
@@ -1861,6 +1864,13 @@ int transSendRequest(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STran
...
@@ -1861,6 +1864,13 @@ int transSendRequest(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STran
return
TSDB_CODE_RPC_BROKEN_LINK
;
return
TSDB_CODE_RPC_BROKEN_LINK
;
}
}
// read only
if
(
pTransInst
->
connLimit
!=
0
&&
atomic_load_32
(
&
pThrd
->
connCount
)
>=
pTransInst
->
connLimit
)
{
transFreeMsg
(
pReq
->
pCont
);
transReleaseExHandle
(
transGetInstMgt
(),
(
int64_t
)
shandle
);
return
TSDB_CODE_RPC_MAX_SESSIONS
;
}
TRACE_SET_MSGID
(
&
pReq
->
info
.
traceId
,
tGenIdPI64
());
TRACE_SET_MSGID
(
&
pReq
->
info
.
traceId
,
tGenIdPI64
());
STransConnCtx
*
pCtx
=
taosMemoryCalloc
(
1
,
sizeof
(
STransConnCtx
));
STransConnCtx
*
pCtx
=
taosMemoryCalloc
(
1
,
sizeof
(
STransConnCtx
));
...
@@ -1902,6 +1912,13 @@ int transSendRecv(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STransMs
...
@@ -1902,6 +1912,13 @@ int transSendRecv(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STransMs
transReleaseExHandle
(
transGetInstMgt
(),
(
int64_t
)
shandle
);
transReleaseExHandle
(
transGetInstMgt
(),
(
int64_t
)
shandle
);
return
TSDB_CODE_RPC_BROKEN_LINK
;
return
TSDB_CODE_RPC_BROKEN_LINK
;
}
}
// not limit sync req
// read only
// if (pTransInst->connLimit != 0 && atomic_load_32(&pThrd->connCount) >= pTransInst->connLimit) {
// transFreeMsg(pReq->pCont);
// transReleaseExHandle(transGetInstMgt(), (int64_t)shandle);
// return TSDB_CODE_RPC_MAX_SESSIONS;
//}
tsem_t
*
sem
=
taosMemoryCalloc
(
1
,
sizeof
(
tsem_t
));
tsem_t
*
sem
=
taosMemoryCalloc
(
1
,
sizeof
(
tsem_t
));
tsem_init
(
sem
,
0
,
0
);
tsem_init
(
sem
,
0
,
0
);
...
...
source/util/src/terror.c
浏览文件 @
e44704b2
...
@@ -52,6 +52,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RPC_PORT_EADDRINUSE, "Port already in use")
...
@@ -52,6 +52,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RPC_PORT_EADDRINUSE, "Port already in use")
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_BROKEN_LINK
,
"Conn is broken"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_BROKEN_LINK
,
"Conn is broken"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_TIMEOUT
,
"Conn read timeout"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_TIMEOUT
,
"Conn read timeout"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED
,
"some vnode/qnode/mnode(s) out of service"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_SOMENODE_NOT_CONNECTED
,
"some vnode/qnode/mnode(s) out of service"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_MAX_SESSIONS
,
"rpc open too many session"
)
//common & util
//common & util
TAOS_DEFINE_ERROR
(
TSDB_CODE_TIME_UNSYNCED
,
"Client and server's time is not synchronized"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_TIME_UNSYNCED
,
"Client and server's time is not synchronized"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录