Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
8680da28
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8680da28
编写于
6月 07, 2022
作者:
M
Minghao Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(sync): snapshot maybe change when sending
上级
24a6b352
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
6 deletion
+19
-6
source/libs/sync/src/syncAppendEntries.c
source/libs/sync/src/syncAppendEntries.c
+1
-1
source/libs/sync/src/syncAppendEntriesReply.c
source/libs/sync/src/syncAppendEntriesReply.c
+5
-0
source/libs/sync/src/syncCommit.c
source/libs/sync/src/syncCommit.c
+1
-1
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+7
-4
source/libs/sync/src/syncRaftLog.c
source/libs/sync/src/syncRaftLog.c
+5
-0
未找到文件。
source/libs/sync/src/syncAppendEntries.c
浏览文件 @
8680da28
...
...
@@ -687,7 +687,7 @@ int32_t syncNodeOnAppendEntriesSnapshotCb(SSyncNode* ths, SyncAppendEntries* pMs
code
=
ths
->
pLogStore
->
updateCommitIndex
(
ths
->
pLogStore
,
ths
->
commitIndex
);
ASSERT
(
code
==
0
);
code
=
syncNodeCommit
(
ths
,
beginIndex
,
endIndex
,
0x11
);
code
=
syncNodeCommit
(
ths
,
beginIndex
,
endIndex
,
ths
->
state
);
ASSERT
(
code
==
0
);
}
}
...
...
source/libs/sync/src/syncAppendEntriesReply.c
浏览文件 @
8680da28
...
...
@@ -178,9 +178,14 @@ int32_t syncNodeOnAppendEntriesReplySnapshotCb(SSyncNode* ths, SyncAppendEntries
if
(
pSender
->
start
&&
pSender
->
term
==
ths
->
pRaftStore
->
currentTerm
)
{
// already start
sentryIndex
=
pSender
->
snapshot
.
lastApplyIndex
;
sTrace
(
"sending snapshot already start: pSender->term:%lu, ths->pRaftStore->currentTerm:%lu"
,
pSender
->
term
,
ths
->
pRaftStore
->
currentTerm
);
}
else
{
// start send snapshot, first time
sTrace
(
"sending snapshot start first: pSender->term:%lu, ths->pRaftStore->currentTerm:%lu"
,
pSender
->
term
,
ths
->
pRaftStore
->
currentTerm
);
snapshotSenderDoStart
(
pSender
);
pSender
->
start
=
true
;
sentryIndex
=
pSender
->
snapshot
.
lastApplyIndex
;
...
...
source/libs/sync/src/syncCommit.c
浏览文件 @
8680da28
...
...
@@ -94,7 +94,7 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
// execute fsm
if
(
pSyncNode
->
pFsm
!=
NULL
)
{
int32_t
code
=
syncNodeCommit
(
pSyncNode
,
beginIndex
,
endIndex
,
0x1
);
int32_t
code
=
syncNodeCommit
(
pSyncNode
,
beginIndex
,
endIndex
,
pSyncNode
->
state
);
ASSERT
(
code
==
0
);
#if 0
...
...
source/libs/sync/src/syncMain.c
浏览文件 @
8680da28
...
...
@@ -1558,7 +1558,8 @@ static int32_t syncNodeAppendNoop(SSyncNode* ths) {
assert
(
pEntry
!=
NULL
);
if
(
ths
->
state
==
TAOS_SYNC_STATE_LEADER
)
{
ths
->
pLogStore
->
appendEntry
(
ths
->
pLogStore
,
pEntry
);
// ths->pLogStore->appendEntry(ths->pLogStore, pEntry);
ths
->
pLogStore
->
syncLogAppendEntry
(
ths
->
pLogStore
,
pEntry
);
syncNodeReplicate
(
ths
);
}
...
...
@@ -1620,7 +1621,8 @@ int32_t syncNodeOnClientRequestCb(SSyncNode* ths, SyncClientRequest* pMsg) {
assert
(
pEntry
!=
NULL
);
if
(
ths
->
state
==
TAOS_SYNC_STATE_LEADER
)
{
ths
->
pLogStore
->
appendEntry
(
ths
->
pLogStore
,
pEntry
);
// ths->pLogStore->appendEntry(ths->pLogStore, pEntry);
ths
->
pLogStore
->
syncLogAppendEntry
(
ths
->
pLogStore
,
pEntry
);
// start replicate right now!
syncNodeReplicate
(
ths
);
...
...
@@ -1692,8 +1694,9 @@ const char* syncStr(ESyncState state) {
}
int32_t
syncNodeCommit
(
SSyncNode
*
ths
,
SyncIndex
beginIndex
,
SyncIndex
endIndex
,
uint64_t
flag
)
{
int32_t
code
=
0
;
sInfo
(
"sync commit from %ld to %ld, flag:0x%lX"
,
beginIndex
,
endIndex
,
flag
);
int32_t
code
=
0
;
ESyncState
state
=
flag
;
sInfo
(
"sync event commit from %ld to %ld, %s"
,
beginIndex
,
endIndex
,
syncUtilState2String
(
state
));
// maybe execute by leader, skip snapshot
SSnapshot
snapshot
=
{.
data
=
NULL
,
.
lastApplyIndex
=
-
1
,
.
lastApplyTerm
=
0
};
...
...
source/libs/sync/src/syncRaftLog.c
浏览文件 @
8680da28
...
...
@@ -156,6 +156,9 @@ static int32_t raftLogAppendEntry(struct SSyncLogStore* pLogStore, SSyncRaftEntr
}
walFsync
(
pWal
,
true
);
sTrace
(
"sync event write wal: %ld"
,
pEntry
->
index
);
return
code
;
}
...
...
@@ -309,6 +312,8 @@ int32_t logStoreAppendEntry(SSyncLogStore* pLogStore, SSyncRaftEntry* pEntry) {
// assert(code == 0);
walFsync
(
pWal
,
true
);
sTrace
(
"sync event old write wal: %ld"
,
pEntry
->
index
);
return
code
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录