xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/TD-4672' of https://github.com/taosdata/TDengine into fix/TD-4672

This commit is contained in:
Minglei Jin 2021-06-17 14:50:06 +08:00
parent 58f49c5dc5 0364437022
commit c7769d2551
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sync/src/syncMain.c
View File

@ -892,7 +892,7 @@ static void syncProcessSyncRequest(char *msg, SSyncPeer *pPeer) {
sInfo("%s, sync-req is received", pPeer->id);
//if (pPeer->ip == 0) return;
if (!syncResolvePeerFqdn(pPeer)) return;
if (pPeer->fqdn[0] == '\0') return;
if (nodeRole != TAOS_SYNC_ROLE_MASTER) {
sError("%s, I am not master anymore", pPeer->id);
@ -1104,7 +1104,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->fqdn[0] == '\0') {
sDebug("%s, failed to send status msg, restart fd:%d", pPeer->id, pPeer->peerFd);
syncRestartConnection(pPeer);
return -1;
@ -1150,7 +1150,10 @@ static void syncSetupPeerConnection(SSyncPeer *pPeer) {
}
uint32_t ip = syncResolvePeerFqdn(pPeer);
if (!ip) return;
if (!ip) {
taosTmrReset(syncCheckPeerConnection, SYNC_CHECK_INTERVAL, (void *)pPeer->rid, tsSyncTmrCtrl, &pPeer->timer);
return;
}
SOCKET connFd = taosOpenTcpClientSocket(ip, pPeer->port, 0);
if (connFd <= 0) {