From 43c383dcbc14824aa39ef7d3a8cec95a2d42754a Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Mon, 30 May 2022 17:19:31 +0800 Subject: [PATCH] enh(sync): add snapshotEnable2 --- include/libs/sync/syncTools.h | 6 +++--- source/libs/sync/inc/syncInt.h | 4 ++-- source/libs/sync/inc/syncSnapshot.h | 2 ++ source/libs/sync/src/syncSnapshot.c | 4 ++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/libs/sync/syncTools.h b/include/libs/sync/syncTools.h index bacdc4fbe3..4db9dc0051 100644 --- a/include/libs/sync/syncTools.h +++ b/include/libs/sync/syncTools.h @@ -399,7 +399,7 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl int32_t syncNodeOnAppendEntriesSnapshotCb(SSyncNode* ths, SyncAppendEntries* pMsg); int32_t syncNodeOnAppendEntriesReplySnapshotCb(SSyncNode* ths, SyncAppendEntriesReply* pMsg); -// option ---------------------------------- +// ----------------------------------------- typedef int32_t (*FpOnPingCb)(SSyncNode* ths, SyncPing* pMsg); typedef int32_t (*FpOnPingReplyCb)(SSyncNode* ths, SyncPingReply* pMsg); typedef int32_t (*FpOnClientRequestCb)(SSyncNode* ths, SyncClientRequest* pMsg); @@ -409,9 +409,9 @@ typedef int32_t (*FpOnAppendEntriesCb)(SSyncNode* ths, SyncAppendEntries* pMsg); typedef int32_t (*FpOnAppendEntriesReplyCb)(SSyncNode* ths, SyncAppendEntriesReply* pMsg); typedef int32_t (*FpOnTimeoutCb)(SSyncNode* pSyncNode, SyncTimeout* pMsg); -// --------------------------------------------- - +// option ---------------------------------- bool syncNodeSnapshotEnable(SSyncNode* pSyncNode); + // --------------------------------------------- #ifdef __cplusplus diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h index a47dd0d74a..64552fb10a 100644 --- a/source/libs/sync/inc/syncInt.h +++ b/source/libs/sync/inc/syncInt.h @@ -164,8 +164,8 @@ typedef struct SSyncNode { // sem_t restoreSem; bool restoreFinish; SSnapshot* pSnapshot; - SSyncSnapshotSender* pSender; - SSyncSnapshotReceiver* pReceiver; + SSyncSnapshotSender* senders[TSDB_MAX_REPLICA]; + SSyncSnapshotReceiver* receivers[TSDB_MAX_REPLICA]; } SSyncNode; diff --git a/source/libs/sync/inc/syncSnapshot.h b/source/libs/sync/inc/syncSnapshot.h index 43d1c0c0c3..2e2975fbc9 100644 --- a/source/libs/sync/inc/syncSnapshot.h +++ b/source/libs/sync/inc/syncSnapshot.h @@ -40,6 +40,8 @@ typedef struct SSyncSnapshotSender { SSyncSnapshotSender *snapshotSenderCreate(SSyncNode *pSyncNode); void snapshotSenderDestroy(SSyncSnapshotSender *pSender); +void snapshotSenderStart(SSyncSnapshotSender *pSender); +void snapshotSenderStop(SSyncSnapshotSender *pSender); int32_t snapshotSend(SSyncSnapshotSender *pSender); cJSON * snapshotSender2Json(SSyncSnapshotSender *pSender); char * snapshotSender2Str(SSyncSnapshotSender *pSender); diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c index ccb0e6071b..760d72235c 100644 --- a/source/libs/sync/src/syncSnapshot.c +++ b/source/libs/sync/src/syncSnapshot.c @@ -19,6 +19,10 @@ SSyncSnapshotSender *snapshotSenderCreate(SSyncNode *pSyncNode) { return NULL; } void snapshotSenderDestroy(SSyncSnapshotSender *pSender) {} +void snapshotSenderStart(SSyncSnapshotSender *pSender) {} + +void snapshotSenderStop(SSyncSnapshotSender *pSender) {} + int32_t snapshotSend(SSyncSnapshotSender *pSender) { return 0; } cJSON *snapshotSender2Json(SSyncSnapshotSender *pSender) { return NULL; }