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

fixup: fix syncNodeOnSnapshotPrep

This commit is contained in:
Benguang Zhao 2023-09-12 19:27:54 +08:00
parent 4d55488495
commit 517f1f7e40
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,15 +605,16 @@ _SEND_REPLY:
// build msg // build msg
; // make complier happy ; // make complier happy
code = -1;
SSnapshot snapInfo = {.typ = TAOS_SYNC_SNAP_INFO_DIFF}; SSnapshot snapInfo = {.typ = TAOS_SYNC_SNAP_INFO_DIFF};
int32_t dataLen = 0; int32_t dataLen = 0;
if (pMsg->dataLen > 0) { if (pMsg->dataLen > 0) {
void *data = taosMemoryCalloc(1, pMsg->dataLen); void *data = taosMemoryCalloc(1, pMsg->dataLen);
if (data == NULL) { if (data == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;
code = terrno;
goto _out; goto _out;
} }
dataLen = pMsg->dataLen;
memcpy(data, pMsg->data, dataLen); memcpy(data, pMsg->data, dataLen);
snapInfo.data = data; snapInfo.data = data;
data = NULL; data = NULL;
@ -627,6 +628,7 @@ _SEND_REPLY:
SRpcMsg rpcMsg = {0}; SRpcMsg rpcMsg = {0};
if (syncBuildSnapshotSendRsp(&rpcMsg, dataLen, pSyncNode->vgId) != 0) { if (syncBuildSnapshotSendRsp(&rpcMsg, dataLen, pSyncNode->vgId) != 0) {
sRError(pReceiver, "snapshot receiver failed to build resp since %s", terrstr()); sRError(pReceiver, "snapshot receiver failed to build resp since %s", terrstr());
code = terrno;
goto _out; goto _out;
} }
@ -650,10 +652,9 @@ _SEND_REPLY:
syncLogSendSyncSnapshotRsp(pSyncNode, pRspMsg, "snapshot receiver pre-snapshot"); syncLogSendSyncSnapshotRsp(pSyncNode, pRspMsg, "snapshot receiver pre-snapshot");
if (syncNodeSendMsgById(&pRspMsg->destId, pSyncNode, &rpcMsg) != 0) { if (syncNodeSendMsgById(&pRspMsg->destId, pSyncNode, &rpcMsg) != 0) {
sRError(pReceiver, "snapshot receiver failed to build resp since %s", terrstr()); sRError(pReceiver, "snapshot receiver failed to build resp since %s", terrstr());
goto _out; code = terrno;
} }
code = 0;
_out: _out:
if (snapInfo.data) { if (snapInfo.data) {
taosMemoryFree(snapInfo.data); taosMemoryFree(snapInfo.data);