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

Merge branch 'feature/sync-refactor' of https://github.com/taosdata/TDengine into feature/sync-refactor

This commit is contained in:
Shengliang Guan 2022-06-09 16:33:43 +08:00
parent 0beb323653 9a61a567c5
commit 81e431b16a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/sync/src/syncAppendEntriesReply.c
View File

@ -179,7 +179,7 @@ int32_t syncNodeOnAppendEntriesReplySnapshotCb(SSyncNode* ths, SyncAppendEntries
snapshotSenderStart(pSender); snapshotSenderStart(pSender);
char* s = snapshotSender2Str(pSender); char* s = snapshotSender2Str(pSender);
sInfo("snapshot send start sender first time, sender:%s", s); sInfo("sync event snapshot send start sender first time, sender:%s", s);
taosMemoryFree(s); taosMemoryFree(s);
} }

9
source/libs/sync/src/syncSnapshot.c
View File

@ -109,8 +109,8 @@ void snapshotSenderStart(SSyncSnapshotSender *pSender) {
char host[128]; char host[128];
uint16_t port; uint16_t port;
syncUtilU642Addr(pSender->pSyncNode->replicasId[pSender->replicaIndex].addr, host, sizeof(host), &port); syncUtilU642Addr(pSender->pSyncNode->replicasId[pSender->replicaIndex].addr, host, sizeof(host), &port);
sTrace("sync event snapshot send to %s:%d begin seq:%d ack:%d send msg:%s", host, port, pSender->seq, pSender->ack, sTrace("sync event snapshot send to %s:%d begin seq:%d ack:%d lastApplyIndex:%ld lastApplyTerm:%lu send msg:%s", host,
msgStr); port, pSender->seq, pSender->ack, pSender->snapshot.lastApplyIndex, pSender->snapshot.lastApplyTerm, msgStr);
taosMemoryFree(msgStr); taosMemoryFree(msgStr);
syncSnapshotSendDestroy(pMsg); syncSnapshotSendDestroy(pMsg);
@ -234,8 +234,9 @@ int32_t snapshotSend(SSyncSnapshotSender *pSender) {
host, port, pSender->seq, pSender->ack, pSender->snapshot.lastApplyIndex, pSender->snapshot.lastApplyTerm, host, port, pSender->seq, pSender->ack, pSender->snapshot.lastApplyIndex, pSender->snapshot.lastApplyTerm,
msgStr); msgStr);
} else { } else {
sTrace("sync event snapshot send to %s:%d sending seq:%d ack:%d send msg:%s", host, port, pSender->seq, sTrace("sync event snapshot send to %s:%d sending seq:%d ack:%d lastApplyIndex:%ld lastApplyTerm:%lu send msg:%s",
pSender->ack, msgStr); host, port, pSender->seq, pSender->ack, pSender->snapshot.lastApplyIndex, pSender->snapshot.lastApplyTerm,
msgStr);
} }
taosMemoryFree(msgStr); taosMemoryFree(msgStr);