From d2f84105863725e23b6fbb77cdb0d94df19a41c5 Mon Sep 17 00:00:00 2001 From: Benguang Zhao Date: Sun, 28 Apr 2024 16:41:49 +0800 Subject: [PATCH] enh: propagate code of vnodeSnapRead as terrno upwards --- source/libs/sync/src/syncSnapshot.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c index 5c1f8739bd..973eb8aaa5 100644 --- a/source/libs/sync/src/syncSnapshot.c +++ b/source/libs/sync/src/syncSnapshot.c @@ -285,10 +285,11 @@ static int32_t snapshotSend(SSyncSnapshotSender *pSender) { pBlk->seq = pSender->seq; // read data - int32_t ret = pSender->pSyncNode->pFsm->FpSnapshotDoRead(pSender->pSyncNode->pFsm, pSender->pReader, - &pBlk->pBlock, &pBlk->blockLen); - if (ret != 0) { - sSError(pSender, "snapshot sender read failed since %s", terrstr()); + code = pSender->pSyncNode->pFsm->FpSnapshotDoRead(pSender->pSyncNode->pFsm, pSender->pReader, &pBlk->pBlock, + &pBlk->blockLen); + if (code != 0) { + terrno = code; + sSError(pSender, "snapshot sender read failed since %s", tstrerror(code)); goto _OUT; } @@ -357,7 +358,7 @@ int32_t snapshotReSend(SSyncSnapshotSender *pSender) { } if (pSender->seq != SYNC_SNAPSHOT_SEQ_END && pSndBuf->end <= pSndBuf->start) { - if (snapshotSend(pSender) != 0) { + if ((code = snapshotSend(pSender)) != 0) { goto _out; } } @@ -1188,15 +1189,13 @@ static int32_t syncSnapBufferSend(SSyncSnapshotSender *pSender, SyncSnapshotRsp } while (pSender->seq != SYNC_SNAPSHOT_SEQ_END && pSender->seq - pSndBuf->start < tsSnapReplMaxWaitN) { - if (snapshotSend(pSender) != 0) { - code = terrno; + if ((code = snapshotSend(pSender)) != 0) { goto _out; } } if (pSender->seq == SYNC_SNAPSHOT_SEQ_END && pSndBuf->end <= pSndBuf->start) { - if (snapshotSend(pSender) != 0) { - code = terrno; + if ((code = snapshotSend(pSender)) != 0) { goto _out; } } @@ -1225,7 +1224,7 @@ int32_t syncNodeOnSnapshotRsp(SSyncNode *pSyncNode, SRpcMsg *pRpcMsg) { } if (!snapshotSenderIsStart(pSender)) { - sSError(pSender, "snapshot sender not started yet. sender startTime:%" PRId64 ", msg startTime:%" PRId64, + sSError(pSender, "snapshot sender stopped. sender startTime:%" PRId64 ", msg startTime:%" PRId64, pSender->startTime, pMsg->startTime); return -1; }