Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
dbd24dcf
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dbd24dcf
编写于
11月 30, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/feature/3.0_mhli' into fix/TD-20798
上级
d4035e26
f0fdc58c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
3 deletion
+24
-3
include/libs/sync/sync.h
include/libs/sync/sync.h
+5
-0
source/libs/sync/inc/syncInt.h
source/libs/sync/inc/syncInt.h
+1
-0
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+14
-3
source/libs/sync/src/syncSnapshot.c
source/libs/sync/src/syncSnapshot.c
+4
-0
未找到文件。
include/libs/sync/sync.h
浏览文件 @
dbd24dcf
...
...
@@ -211,9 +211,14 @@ typedef struct SSyncInfo {
int32_t
(
*
syncEqCtrlMsg
)(
const
SMsgCb
*
msgcb
,
SRpcMsg
*
pMsg
);
}
SSyncInfo
;
// if state == leader
// if restored, display "leader"
// if !restored && canRead, display "leader*"
// if !restored && !canRead, display "leader**"
typedef
struct
SSyncState
{
ESyncState
state
;
bool
restored
;
bool
canRead
;
}
SSyncState
;
int32_t
syncInit
();
...
...
source/libs/sync/inc/syncInt.h
浏览文件 @
dbd24dcf
...
...
@@ -244,6 +244,7 @@ int32_t syncCacheEntry(SSyncLogStore* pLogStore, SSyncRaftEntry* pEntry, LRUHa
bool
syncNodeHeartbeatReplyTimeout
(
SSyncNode
*
pSyncNode
);
bool
syncNodeSnapshotSending
(
SSyncNode
*
pSyncNode
);
bool
syncNodeSnapshotRecving
(
SSyncNode
*
pSyncNode
);
bool
syncNodeIsReadyForRead
(
SSyncNode
*
pSyncNode
);
// raft state change --------------
void
syncNodeUpdateTerm
(
SSyncNode
*
pSyncNode
,
SyncTerm
term
);
...
...
source/libs/sync/src/syncMain.c
浏览文件 @
dbd24dcf
...
...
@@ -381,15 +381,13 @@ int32_t syncStepDown(int64_t rid, SyncTerm newTerm) {
return
0
;
}
bool
syncIsReadyForRead
(
int64_t
rid
)
{
SSyncNode
*
pSyncNode
=
syncNodeAcquire
(
rid
);
bool
syncNodeIsReadyForRead
(
SSyncNode
*
pSyncNode
)
{
if
(
pSyncNode
==
NULL
)
{
sError
(
"sync ready for read error"
);
return
false
;
}
if
(
pSyncNode
->
state
==
TAOS_SYNC_STATE_LEADER
&&
pSyncNode
->
restoreFinish
)
{
syncNodeRelease
(
pSyncNode
);
return
true
;
}
...
...
@@ -443,6 +441,18 @@ bool syncIsReadyForRead(int64_t rid) {
}
}
return
ready
;
}
bool
syncIsReadyForRead
(
int64_t
rid
)
{
SSyncNode
*
pSyncNode
=
syncNodeAcquire
(
rid
);
if
(
pSyncNode
==
NULL
)
{
sError
(
"sync ready for read error"
);
return
false
;
}
bool
ready
=
syncNodeIsReadyForRead
(
pSyncNode
);
syncNodeRelease
(
pSyncNode
);
return
ready
;
}
...
...
@@ -521,6 +531,7 @@ SSyncState syncGetState(int64_t rid) {
if
(
pSyncNode
!=
NULL
)
{
state
.
state
=
pSyncNode
->
state
;
state
.
restored
=
pSyncNode
->
restoreFinish
;
state
.
canRead
=
syncNodeIsReadyForRead
(
pSyncNode
);
syncNodeRelease
(
pSyncNode
);
}
...
...
source/libs/sync/src/syncSnapshot.c
浏览文件 @
dbd24dcf
...
...
@@ -541,6 +541,10 @@ _START_RECEIVER:
taosMsleep
(
10
);
}
if
(
snapshotReceiverIsStart
(
pReceiver
))
{
snapshotReceiverForceStop
(
pReceiver
);
}
snapshotReceiverStart
(
pReceiver
,
pMsg
);
// set start-time same with sender
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录