Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN产品汪
TDengine
提交
c0aed598
T
TDengine
项目概览
CSDN产品汪
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c0aed598
编写于
6月 09, 2020
作者:
陶建辉(Jeff)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
report broken link to server
上级
14313882
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
27 deletion
+27
-27
src/inc/trpc.h
src/inc/trpc.h
+1
-0
src/rpc/src/rpcMain.c
src/rpc/src/rpcMain.c
+26
-27
未找到文件。
src/inc/trpc.h
浏览文件 @
c0aed598
...
...
@@ -83,6 +83,7 @@ void rpcSendResponse(const SRpcMsg *pMsg);
void
rpcSendRedirectRsp
(
void
*
pConn
,
const
SRpcIpSet
*
pIpSet
);
int
rpcGetConnInfo
(
void
*
thandle
,
SRpcConnInfo
*
pInfo
);
void
rpcSendRecv
(
void
*
shandle
,
SRpcIpSet
*
pIpSet
,
const
SRpcMsg
*
pReq
,
SRpcMsg
*
pRsp
);
void
rpcReportProgress
(
void
*
pConn
,
char
*
pCont
,
int
contLen
);
#ifdef __cplusplus
}
...
...
src/rpc/src/rpcMain.c
浏览文件 @
c0aed598
...
...
@@ -482,6 +482,15 @@ void rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, const SRpcMsg *pMsg, SRpcMsg
return
;
}
// this API is used by server app to keep an APP context in case connection is broken
void
rpcReportProgress
(
void
*
handle
,
char
*
pCont
,
int
contLen
)
{
SRpcConn
*
pConn
=
(
SRpcConn
*
)
handle
;
// pReqMsg and reqMsgLen is re-used to store the context from app server
pConn
->
pReqMsg
=
pCont
;
pConn
->
reqMsgLen
=
contLen
;
}
static
void
rpcFreeMsg
(
void
*
msg
)
{
if
(
msg
)
{
char
*
temp
=
(
char
*
)
msg
-
sizeof
(
SRpcReqContext
);
...
...
@@ -846,6 +855,21 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
return
pConn
;
}
static
void
rpcReportBrokenLinkToServer
(
SRpcConn
*
pConn
)
{
SRpcInfo
*
pRpc
=
pConn
->
pRpc
;
// if there are pending request, notify the app
tTrace
(
"%s, notify the server app, connection is gone"
,
pConn
->
info
);
SRpcMsg
rpcMsg
;
rpcMsg
.
pCont
=
pConn
->
pReqMsg
;
// pReqMsg is re-used to store the APP context from server
rpcMsg
.
contLen
=
pConn
->
reqMsgLen
;
// reqMsgLen is re-used to store the APP context length
rpcMsg
.
handle
=
pConn
;
rpcMsg
.
msgType
=
pConn
->
inType
;
rpcMsg
.
code
=
TSDB_CODE_RPC_NETWORK_UNAVAIL
;
if
(
pRpc
->
cfp
)
(
*
(
pRpc
->
cfp
))(
&
rpcMsg
,
NULL
);
}
static
void
rpcProcessBrokenLink
(
SRpcConn
*
pConn
)
{
if
(
pConn
==
NULL
)
return
;
SRpcInfo
*
pRpc
=
pConn
->
pRpc
;
...
...
@@ -859,19 +883,7 @@ static void rpcProcessBrokenLink(SRpcConn *pConn) {
taosTmrStart
(
rpcProcessConnError
,
0
,
pContext
,
pRpc
->
tmrCtrl
);
}
if
(
pConn
->
inType
)
{
// if there are pending request, notify the app
tTrace
(
"%s, connection is gone, notify the app"
,
pConn
->
info
);
/*
SRpcMsg rpcMsg;
rpcMsg.pCont = NULL;
rpcMsg.contLen = 0;
rpcMsg.handle = pConn;
rpcMsg.msgType = pConn->inType;
rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
(*(pRpc->cfp))(&rpcMsg);
*/
}
if
(
pConn
->
inType
)
rpcReportBrokenLinkToServer
(
pConn
);
rpcUnlockConn
(
pConn
);
rpcCloseConn
(
pConn
);
...
...
@@ -1210,23 +1222,10 @@ static void rpcProcessRetryTimer(void *param, void *tmrId) {
static
void
rpcProcessIdleTimer
(
void
*
param
,
void
*
tmrId
)
{
SRpcConn
*
pConn
=
(
SRpcConn
*
)
param
;
SRpcInfo
*
pRpc
=
pConn
->
pRpc
;
if
(
pConn
->
user
[
0
])
{
tTrace
(
"%s, close the connection since no activity"
,
pConn
->
info
);
if
(
pConn
->
inType
&&
pRpc
->
cfp
)
{
// if there are pending request, notify the app
tTrace
(
"%s, notify the app, connection is gone"
,
pConn
->
info
);
/*
SRpcMsg rpcMsg;
rpcMsg.pCont = NULL;
rpcMsg.contLen = 0;
rpcMsg.handle = pConn;
rpcMsg.msgType = pConn->inType;
rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
(*(pRpc->cfp))(&rpcMsg);
*/
}
if
(
pConn
->
inType
)
rpcReportBrokenLinkToServer
(
pConn
);
rpcCloseConn
(
pConn
);
}
else
{
tTrace
(
"%s, idle timer:%p not processed"
,
pConn
->
info
,
tmrId
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录