From 0b494d256f4a9187a389d556f42c08b0d160265a Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Sat, 23 Jul 2022 19:18:18 +0800 Subject: [PATCH 1/2] refactor(sync): add ref id in raft entry --- source/libs/sync/inc/syncRaftEntry.h | 1 + source/libs/sync/src/syncRaftEntry.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/source/libs/sync/inc/syncRaftEntry.h b/source/libs/sync/inc/syncRaftEntry.h index fdfabf12a3..607ff4ba24 100644 --- a/source/libs/sync/inc/syncRaftEntry.h +++ b/source/libs/sync/inc/syncRaftEntry.h @@ -36,6 +36,7 @@ typedef struct SSyncRaftEntry { bool isWeak; SyncTerm term; SyncIndex index; + int64_t rid; uint32_t dataLen; // origin RpcMsg.contLen char data[]; // origin RpcMsg.pCont } SSyncRaftEntry; diff --git a/source/libs/sync/src/syncRaftEntry.c b/source/libs/sync/src/syncRaftEntry.c index 89e67fab28..64cff4d93d 100644 --- a/source/libs/sync/src/syncRaftEntry.c +++ b/source/libs/sync/src/syncRaftEntry.c @@ -137,6 +137,8 @@ cJSON* syncEntry2Json(const SSyncRaftEntry* pEntry) { cJSON_AddStringToObject(pRoot, "term", u64buf); snprintf(u64buf, sizeof(u64buf), "%" PRIu64, pEntry->index); cJSON_AddStringToObject(pRoot, "index", u64buf); + snprintf(u64buf, sizeof(u64buf), "%" PRIu64, pEntry->rid); + cJSON_AddStringToObject(pRoot, "rid", u64buf); cJSON_AddNumberToObject(pRoot, "dataLen", pEntry->dataLen); char* s; From dcdb7144c4f3e2befe6be9838bd00055de2d9651 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Sat, 23 Jul 2022 19:54:56 +0800 Subject: [PATCH 2/2] refactor(sync): delete timeout check --- include/libs/sync/sync.h | 2 +- source/libs/sync/src/syncTimeout.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h index 510f816959..d767b3521e 100644 --- a/include/libs/sync/sync.h +++ b/include/libs/sync/sync.h @@ -26,7 +26,7 @@ extern "C" { extern bool gRaftDetailLog; -#define SYNC_RESP_TTL_MS 10000 +#define SYNC_RESP_TTL_MS 10000000 #define SYNC_MAX_BATCH_SIZE 500 #define SYNC_INDEX_BEGIN 0 diff --git a/source/libs/sync/src/syncTimeout.c b/source/libs/sync/src/syncTimeout.c index ad5f82900c..ff1f2c5af9 100644 --- a/source/libs/sync/src/syncTimeout.c +++ b/source/libs/sync/src/syncTimeout.c @@ -19,11 +19,14 @@ #include "syncRespMgr.h" int32_t syncNodeTimerRoutine(SSyncNode* ths) { - syncNodeEventLog(ths, "timer routines ... "); + syncNodeEventLog(ths, "timer routines"); +#if 0 if (ths->vgId != 1) { syncRespClean(ths->pSyncRespMgr); } +#endif + return 0; }