Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
291750b9
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
291750b9
编写于
12月 08, 2022
作者:
M
Minghao Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(sync): snapshot problem
上级
d992b649
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
2 deletion
+5
-2
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+1
-1
source/libs/sync/src/syncSnapshot.c
source/libs/sync/src/syncSnapshot.c
+4
-1
未找到文件。
source/libs/sync/src/syncMain.c
浏览文件 @
291750b9
...
@@ -151,7 +151,7 @@ int32_t syncReconfig(int64_t rid, SSyncCfg* pNewCfg) {
...
@@ -151,7 +151,7 @@ int32_t syncReconfig(int64_t rid, SSyncCfg* pNewCfg) {
}
}
syncNodeStartHeartbeatTimer
(
pSyncNode
);
syncNodeStartHeartbeatTimer
(
pSyncNode
);
syncNodeReplicate
(
pSyncNode
);
//
syncNodeReplicate(pSyncNode);
}
}
syncNodeRelease
(
pSyncNode
);
syncNodeRelease
(
pSyncNode
);
...
...
source/libs/sync/src/syncSnapshot.c
浏览文件 @
291750b9
...
@@ -345,6 +345,8 @@ bool snapshotReceiverIsStart(SSyncSnapshotReceiver *pReceiver) { return pReceive
...
@@ -345,6 +345,8 @@ bool snapshotReceiverIsStart(SSyncSnapshotReceiver *pReceiver) { return pReceive
void
snapshotReceiverForceStop
(
SSyncSnapshotReceiver
*
pReceiver
)
{
void
snapshotReceiverForceStop
(
SSyncSnapshotReceiver
*
pReceiver
)
{
// force close, abandon incomplete data
// force close, abandon incomplete data
if
(
pReceiver
->
pWriter
!=
NULL
)
{
if
(
pReceiver
->
pWriter
!=
NULL
)
{
// event log
sRTrace
(
pReceiver
,
"snapshot receiver force stop"
);
int32_t
ret
=
pReceiver
->
pSyncNode
->
pFsm
->
FpSnapshotStopWrite
(
pReceiver
->
pSyncNode
->
pFsm
,
pReceiver
->
pWriter
,
false
,
int32_t
ret
=
pReceiver
->
pSyncNode
->
pFsm
->
FpSnapshotStopWrite
(
pReceiver
->
pSyncNode
->
pFsm
,
pReceiver
->
pWriter
,
false
,
&
(
pReceiver
->
snapshot
));
&
(
pReceiver
->
snapshot
));
ASSERT
(
ret
==
0
);
ASSERT
(
ret
==
0
);
...
@@ -354,7 +356,7 @@ void snapshotReceiverForceStop(SSyncSnapshotReceiver *pReceiver) {
...
@@ -354,7 +356,7 @@ void snapshotReceiverForceStop(SSyncSnapshotReceiver *pReceiver) {
pReceiver
->
start
=
false
;
pReceiver
->
start
=
false
;
// event log
// event log
sRTrace
(
pReceiver
,
"snapshot receiver force stop"
);
//
sRTrace(pReceiver, "snapshot receiver force stop");
}
}
int32_t
snapshotReceiverStartWriter
(
SSyncSnapshotReceiver
*
pReceiver
,
SyncSnapshotSend
*
pBeginMsg
)
{
int32_t
snapshotReceiverStartWriter
(
SSyncSnapshotReceiver
*
pReceiver
,
SyncSnapshotSend
*
pBeginMsg
)
{
...
@@ -675,6 +677,7 @@ static int32_t syncNodeOnSnapshotEnd(SSyncNode *pSyncNode, SyncSnapshotSend *pMs
...
@@ -675,6 +677,7 @@ static int32_t syncNodeOnSnapshotEnd(SSyncNode *pSyncNode, SyncSnapshotSend *pMs
sNTrace
(
pSyncNode
,
"snapshot receiver finish waitting for true time, now:%"
PRId64
", stime:%"
PRId64
,
timeNow
,
sNTrace
(
pSyncNode
,
"snapshot receiver finish waitting for true time, now:%"
PRId64
", stime:%"
PRId64
,
timeNow
,
pMsg
->
startTime
);
pMsg
->
startTime
);
taosMsleep
(
10
);
taosMsleep
(
10
);
timeNow
=
taosGetTimestampMs
();
}
}
int32_t
code
=
snapshotReceiverFinish
(
pReceiver
,
pMsg
);
int32_t
code
=
snapshotReceiverFinish
(
pReceiver
,
pMsg
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录