Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
decb17fc
T
TDengine
项目概览
taosdata
/
TDengine
11 个月 前同步成功
通知
1179
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
decb17fc
编写于
11月 29, 2022
作者:
B
Benguang Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: use recursive mutex for relocking ring log buffer in syncNodeDoConfigChange
上级
470441c5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
3 deletion
+19
-3
source/libs/sync/inc/syncPipeline.h
source/libs/sync/inc/syncPipeline.h
+1
-0
source/libs/sync/src/syncCommit.c
source/libs/sync/src/syncCommit.c
+1
-0
source/libs/sync/src/syncMain.c
source/libs/sync/src/syncMain.c
+1
-1
source/libs/sync/src/syncPipeline.c
source/libs/sync/src/syncPipeline.c
+15
-1
source/libs/sync/src/syncReplication.c
source/libs/sync/src/syncReplication.c
+1
-1
未找到文件。
source/libs/sync/inc/syncPipeline.h
浏览文件 @
decb17fc
...
@@ -55,6 +55,7 @@ typedef struct SSyncLogBuffer {
...
@@ -55,6 +55,7 @@ typedef struct SSyncLogBuffer {
int64_t
endIndex
;
int64_t
endIndex
;
int64_t
size
;
int64_t
size
;
TdThreadMutex
mutex
;
TdThreadMutex
mutex
;
TdThreadMutexAttr
attr
;
}
SSyncLogBuffer
;
}
SSyncLogBuffer
;
// SSyncLogRepMgr
// SSyncLogRepMgr
...
...
source/libs/sync/src/syncCommit.c
浏览文件 @
decb17fc
...
@@ -84,6 +84,7 @@ void syncOneReplicaAdvance(SSyncNode* pSyncNode) {
...
@@ -84,6 +84,7 @@ void syncOneReplicaAdvance(SSyncNode* pSyncNode) {
}
}
void
syncMaybeAdvanceCommitIndex
(
SSyncNode
*
pSyncNode
)
{
void
syncMaybeAdvanceCommitIndex
(
SSyncNode
*
pSyncNode
)
{
ASSERT
(
false
&&
"deprecated"
);
if
(
pSyncNode
==
NULL
)
{
if
(
pSyncNode
==
NULL
)
{
sError
(
"pSyncNode is NULL"
);
sError
(
"pSyncNode is NULL"
);
return
;
return
;
...
...
source/libs/sync/src/syncMain.c
浏览文件 @
decb17fc
...
@@ -1602,7 +1602,7 @@ void syncNodeDoConfigChange(SSyncNode* pSyncNode, SSyncCfg* pNewConfig, SyncInde
...
@@ -1602,7 +1602,7 @@ void syncNodeDoConfigChange(SSyncNode* pSyncNode, SSyncCfg* pNewConfig, SyncInde
// Raft 3.6.2 Committing entries from previous terms
// Raft 3.6.2 Committing entries from previous terms
syncNodeAppendNoop
(
pSyncNode
);
syncNodeAppendNoop
(
pSyncNode
);
syncMaybeAdvanceCommitIndex
(
pSyncNode
);
//
syncMaybeAdvanceCommitIndex(pSyncNode);
}
else
{
}
else
{
syncNodeBecomeFollower
(
pSyncNode
,
tmpbuf
);
syncNodeBecomeFollower
(
pSyncNode
,
tmpbuf
);
...
...
source/libs/sync/src/syncPipeline.c
浏览文件 @
decb17fc
...
@@ -916,11 +916,24 @@ SSyncLogBuffer* syncLogBufferCreate() {
...
@@ -916,11 +916,24 @@ SSyncLogBuffer* syncLogBufferCreate() {
ASSERT
(
pBuf
->
size
==
TSDB_SYNC_LOG_BUFFER_SIZE
);
ASSERT
(
pBuf
->
size
==
TSDB_SYNC_LOG_BUFFER_SIZE
);
if
(
taosThreadMutexInit
(
&
pBuf
->
mutex
,
NULL
)
<
0
)
{
if
(
taosThreadMutexAttrInit
(
&
pBuf
->
attr
)
<
0
)
{
sError
(
"failed to init log buffer mutexattr due to %s"
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosThreadMutexAttrSetType
(
&
pBuf
->
attr
,
PTHREAD_MUTEX_RECURSIVE
)
<
0
)
{
sError
(
"failed to set log buffer mutexattr type due to %s"
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
}
if
(
taosThreadMutexInit
(
&
pBuf
->
mutex
,
&
pBuf
->
attr
)
<
0
)
{
sError
(
"failed to init log buffer mutex due to %s"
,
strerror
(
errno
));
sError
(
"failed to init log buffer mutex due to %s"
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
goto
_err
;
}
}
return
pBuf
;
return
pBuf
;
_err:
_err:
...
@@ -947,6 +960,7 @@ void syncLogBufferDestroy(SSyncLogBuffer* pBuf) {
...
@@ -947,6 +960,7 @@ void syncLogBufferDestroy(SSyncLogBuffer* pBuf) {
}
}
syncLogBufferClear
(
pBuf
);
syncLogBufferClear
(
pBuf
);
(
void
)
taosThreadMutexDestroy
(
&
pBuf
->
mutex
);
(
void
)
taosThreadMutexDestroy
(
&
pBuf
->
mutex
);
(
void
)
taosThreadMutexAttrDestroy
(
&
pBuf
->
attr
);
(
void
)
taosMemoryFree
(
pBuf
);
(
void
)
taosMemoryFree
(
pBuf
);
return
;
return
;
}
}
...
...
source/libs/sync/src/syncReplication.c
浏览文件 @
decb17fc
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
int32_t
syncNodeMaybeSendAppendEntries
(
SSyncNode
*
pSyncNode
,
const
SRaftId
*
destRaftId
,
SRpcMsg
*
pRpcMsg
);
int32_t
syncNodeMaybeSendAppendEntries
(
SSyncNode
*
pSyncNode
,
const
SRaftId
*
destRaftId
,
SRpcMsg
*
pRpcMsg
);
int32_t
syncNodeReplicateOne
(
SSyncNode
*
pSyncNode
,
SRaftId
*
pDestId
,
bool
snapshot
)
{
int32_t
syncNodeReplicateOne
(
SSyncNode
*
pSyncNode
,
SRaftId
*
pDestId
,
bool
snapshot
)
{
ASSERT
(
false
&&
"dep
li
cated"
);
ASSERT
(
false
&&
"dep
re
cated"
);
// next index
// next index
SyncIndex
nextIndex
=
syncIndexMgrGetIndex
(
pSyncNode
->
pNextIndex
,
pDestId
);
SyncIndex
nextIndex
=
syncIndexMgrGetIndex
(
pSyncNode
->
pNextIndex
,
pDestId
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录