Skip to content

TDengine
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
TDengine
TDengine
提交 d138fbf4 编写于 作者: S Shengliang Guan
浏览文件
操作

TD-1652

上级 cb1b71f6
显示空白变更内容
内联 并排
Showing with 4 addition and 4 deletion
src/sync/src/syncRetrieve.c
浏览文件 @ d138fbf4
...@@ -256,7 +256,8 @@ static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion, ...@@ -256,7 +256,8 @@ static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion,
} }
(void)lseek(sfd, offset, SEEK_SET); (void)lseek(sfd, offset, SEEK_SET);
sDebug("%s, retrieve last wal, offset:%" PRId64 " fversion:%" PRIu64, pPeer->id, offset, fversion); sDebug("%s, retrieve last wal, offset:%" PRId64 " fversion:%" PRIu64 ", sver:%" PRIu64, pPeer->id, offset, fversion,
pPeer->sversion);
while (1) { while (1) {
int wsize = syncReadOneWalRecord(sfd, pHead, pEvent); int wsize = syncReadOneWalRecord(sfd, pHead, pEvent);
...@@ -266,9 +267,8 @@ static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion, ...@@ -266,9 +267,8 @@ static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion,
break; break;
} }
if (pHead->version > pPeer->version + 1) { if (fversion > 0 && pHead->version > pPeer->sversion + 1) {
sError("%s, last wal skip forward, ver:%" PRIu64 ", peer ver:%" PRIu64, pPeer->id, pHead->version, sError("%s, last wal skip forward, ver:%" PRIu64 ", sver:%" PRIu64, pPeer->id, pHead->version, pPeer->sversion);
pPeer->sversion);
} else { } else {
sDebug("%s, last wal is forwarded, ver:%" PRIu64, pPeer->id, pHead->version); sDebug("%s, last wal is forwarded, ver:%" PRIu64, pPeer->id, pHead->version);
int ret = taosWriteMsg(pPeer->syncFd, pHead, wsize); int ret = taosWriteMsg(pPeer->syncFd, pHead, wsize);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或