Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
03644370
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
03644370
编写于
6月 17, 2021
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-4672]<fix>: remove peer fqdn IP caching
上级
3a740a58
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
9 deletion
+29
-9
src/sync/inc/syncInt.h
src/sync/inc/syncInt.h
+1
-0
src/sync/src/syncMain.c
src/sync/src/syncMain.c
+24
-8
src/sync/src/syncRetrieve.c
src/sync/src/syncRetrieve.c
+4
-1
未找到文件。
src/sync/inc/syncInt.h
浏览文件 @
03644370
...
...
@@ -132,6 +132,7 @@ void * syncRestoreData(void *param);
int32_t
syncSaveIntoBuffer
(
SSyncPeer
*
pPeer
,
SWalHead
*
pHead
);
void
syncRestartConnection
(
SSyncPeer
*
pPeer
);
void
syncBroadcastStatus
(
SSyncNode
*
pNode
);
uint32_t
syncResolvePeerFqdn
(
SSyncPeer
*
pPeer
);
SSyncPeer
*
syncAcquirePeer
(
int64_t
rid
);
void
syncReleasePeer
(
SSyncPeer
*
pPeer
);
...
...
src/sync/src/syncMain.c
浏览文件 @
03644370
...
...
@@ -559,7 +559,7 @@ static void syncClosePeerConn(SSyncPeer *pPeer) {
static
void
syncRemovePeer
(
SSyncPeer
*
pPeer
)
{
sInfo
(
"%s, it is removed"
,
pPeer
->
id
);
pPeer
->
ip
=
0
;
//
pPeer->ip = 0;
syncClosePeerConn
(
pPeer
);
//taosRemoveRef(tsPeerRefId, pPeer->rid);
syncReleasePeer
(
pPeer
);
...
...
@@ -585,20 +585,31 @@ static void syncStopCheckPeerConn(SSyncPeer *pPeer) {
sDebug
(
"%s, stop check peer connection"
,
pPeer
->
id
);
}
uint32_t
syncResolvePeerFqdn
(
SSyncPeer
*
pPeer
)
{
uint32_t
ip
=
taosGetIpv4FromFqdn
(
pPeer
->
fqdn
);
if
(
ip
==
0xFFFFFFFF
)
{
sError
(
"failed to resolve peer fqdn:%s since %s"
,
pPeer
->
fqdn
,
strerror
(
errno
));
terrno
=
TSDB_CODE_RPC_FQDN_ERROR
;
return
0
;
}
return
ip
;
}
static
SSyncPeer
*
syncAddPeer
(
SSyncNode
*
pNode
,
const
SNodeInfo
*
pInfo
)
{
uint32_t
ip
=
taosGetIpv4FromFqdn
(
pInfo
->
nodeFqdn
);
/*
uint32_t ip = taosGetIpv4FromFqdn(pInfo->nodeFqdn);
if (ip == 0xFFFFFFFF) {
sError("failed to add peer, can resolve fqdn:%s since %s", pInfo->nodeFqdn, strerror(errno));
terrno = TSDB_CODE_RPC_FQDN_ERROR;
return NULL;
}
*/
SSyncPeer
*
pPeer
=
calloc
(
1
,
sizeof
(
SSyncPeer
));
if
(
pPeer
==
NULL
)
return
NULL
;
pPeer
->
nodeId
=
pInfo
->
nodeId
;
tstrncpy
(
pPeer
->
fqdn
,
pInfo
->
nodeFqdn
,
sizeof
(
pPeer
->
fqdn
));
pPeer
->
ip
=
ip
;
//
pPeer->ip = ip;
pPeer
->
port
=
pInfo
->
nodePort
;
pPeer
->
fqdn
[
sizeof
(
pPeer
->
fqdn
)
-
1
]
=
0
;
snprintf
(
pPeer
->
id
,
sizeof
(
pPeer
->
id
),
"vgId:%d, nodeId:%d"
,
pNode
->
vgId
,
pPeer
->
nodeId
);
...
...
@@ -864,7 +875,8 @@ static void syncRestartPeer(SSyncPeer *pPeer) {
}
void
syncRestartConnection
(
SSyncPeer
*
pPeer
)
{
if
(
pPeer
->
ip
==
0
)
return
;
//if (pPeer->ip == 0) return;
if
(
!
syncResolvePeerFqdn
(
pPeer
))
return
;
if
(
syncAcquirePeer
(
pPeer
->
rid
)
==
NULL
)
return
;
...
...
@@ -878,7 +890,8 @@ static void syncProcessSyncRequest(char *msg, SSyncPeer *pPeer) {
SSyncNode
*
pNode
=
pPeer
->
pSyncNode
;
sInfo
(
"%s, sync-req is received"
,
pPeer
->
id
);
if
(
pPeer
->
ip
==
0
)
return
;
//if (pPeer->ip == 0) return;
if
(
!
syncResolvePeerFqdn
(
pPeer
))
return
;
if
(
nodeRole
!=
TAOS_SYNC_ROLE_MASTER
)
{
sError
(
"%s, I am not master anymore"
,
pPeer
->
id
);
...
...
@@ -1090,7 +1103,7 @@ static int32_t syncProcessPeerMsg(int64_t rid, void *buffer) {
}
static
int32_t
syncSendPeersStatusMsgToPeer
(
SSyncPeer
*
pPeer
,
char
ack
,
int8_t
type
,
uint16_t
tranId
)
{
if
(
pPeer
->
peerFd
<
0
||
pPeer
->
ip
==
0
)
{
if
(
pPeer
->
peerFd
<
0
/* || pPeer->ip == 0*/
)
{
sDebug
(
"%s, failed to send status msg, restart fd:%d"
,
pPeer
->
id
,
pPeer
->
peerFd
);
syncRestartConnection
(
pPeer
);
return
-
1
;
...
...
@@ -1135,7 +1148,10 @@ static void syncSetupPeerConnection(SSyncPeer *pPeer) {
return
;
}
SOCKET
connFd
=
taosOpenTcpClientSocket
(
pPeer
->
ip
,
pPeer
->
port
,
0
);
uint32_t
ip
=
syncResolvePeerFqdn
(
pPeer
);
if
(
!
ip
)
return
;
SOCKET
connFd
=
taosOpenTcpClientSocket
(
ip
,
pPeer
->
port
,
0
);
if
(
connFd
<=
0
)
{
sDebug
(
"%s, failed to open tcp socket since %s"
,
pPeer
->
id
,
strerror
(
errno
));
taosTmrReset
(
syncCheckPeerConnection
,
SYNC_CHECK_INTERVAL
,
(
void
*
)
pPeer
->
rid
,
tsSyncTmrCtrl
,
&
pPeer
->
timer
);
...
...
src/sync/src/syncRetrieve.c
浏览文件 @
03644370
...
...
@@ -422,6 +422,9 @@ void *syncRetrieveData(void *param) {
return
NULL
;
}
uint32_t
ip
=
syncResolvePeerFqdn
(
pPeer
);
if
(
!
ip
)
return
NULL
;
SSyncNode
*
pNode
=
pPeer
->
pSyncNode
;
taosBlockSIGPIPE
();
...
...
@@ -430,7 +433,7 @@ void *syncRetrieveData(void *param) {
if
(
pNode
->
notifyFlowCtrlFp
)
(
*
pNode
->
notifyFlowCtrlFp
)(
pNode
->
vgId
,
pPeer
->
numOfRetrieves
);
pPeer
->
syncFd
=
taosOpenTcpClientSocket
(
pPeer
->
ip
,
pPeer
->
port
,
0
);
pPeer
->
syncFd
=
taosOpenTcpClientSocket
(
ip
,
pPeer
->
port
,
0
);
if
(
pPeer
->
syncFd
<
0
)
{
sError
(
"%s, failed to open socket to sync"
,
pPeer
->
id
);
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录