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

Merge pull request #18190 from taosdata/fix/TD-20437 

fix(sync): fix asan error, TD-20437
This commit is contained in:
Shengliang Guan 2022-11-16 12:31:38 +08:00 committed by GitHub
parent b60bf7c877 023f61ccf5
commit 9099f5cd10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,10 @@ int32_t syncNodeOnAppendEntriesReply(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
ASSERT(pState != NULL); ASSERT(pState != NULL);
if (pMsg->lastSendIndex == pState->lastSendIndex) { if (pMsg->lastSendIndex == pState->lastSendIndex) {
int64_t timeNow = taosGetTimestampMs();
int64_t elapsed = timeNow - pState->lastSendTime;
sNTrace(ths, "sync-append-entries rtt elapsed:%" PRId64 ", index:%" PRId64, elapsed, pState->lastSendIndex);
syncNodeReplicateOne(ths, &(pMsg->srcId), true); syncNodeReplicateOne(ths, &(pMsg->srcId), true);
} }
} }

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

@ -192,7 +192,9 @@ int32_t snapshotSend(SSyncSnapshotSender *pSender) {
// pMsg->privateTerm = pSender->privateTerm; // pMsg->privateTerm = pSender->privateTerm;
if (pSender->pCurrentBlock != NULL) {
memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen); memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen);
}
// send msg // send msg
syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg); syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg);