Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
00fa4299
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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,发现更多精彩内容 >>
未验证
提交
00fa4299
编写于
12月 13, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
12月 13, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18921 from taosdata/enh/TD-21127
refact: post sem in mnode while sync timeout
上级
b0c336cf
e7646660
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
77 addition
and
37 deletion
+77
-37
source/dnode/mnode/impl/inc/mndInt.h
source/dnode/mnode/impl/inc/mndInt.h
+9
-8
source/dnode/mnode/impl/inc/mndSync.h
source/dnode/mnode/impl/inc/mndSync.h
+1
-0
source/dnode/mnode/impl/src/mndMain.c
source/dnode/mnode/impl/src/mndMain.c
+1
-0
source/dnode/mnode/impl/src/mndSync.c
source/dnode/mnode/impl/src/mndSync.c
+66
-29
未找到文件。
source/dnode/mnode/impl/inc/mndInt.h
浏览文件 @
00fa4299
...
...
@@ -84,14 +84,15 @@ typedef struct {
}
STelemMgmt
;
typedef
struct
{
tsem_t
syncSem
;
int64_t
sync
;
int32_t
errCode
;
int32_t
transId
;
SRWLatch
lock
;
int8_t
selfIndex
;
int8_t
numOfReplicas
;
SReplica
replicas
[
TSDB_MAX_REPLICA
];
tsem_t
syncSem
;
int64_t
sync
;
int32_t
errCode
;
int32_t
transId
;
int32_t
transSec
;
TdThreadMutex
lock
;
int8_t
selfIndex
;
int8_t
numOfReplicas
;
SReplica
replicas
[
TSDB_MAX_REPLICA
];
}
SSyncMgmt
;
typedef
struct
{
...
...
source/dnode/mnode/impl/inc/mndSync.h
浏览文件 @
00fa4299
...
...
@@ -26,6 +26,7 @@ int32_t mndInitSync(SMnode *pMnode);
void
mndCleanupSync
(
SMnode
*
pMnode
);
bool
mndIsLeader
(
SMnode
*
pMnode
);
int32_t
mndSyncPropose
(
SMnode
*
pMnode
,
SSdbRaw
*
pRaw
,
int32_t
transId
);
void
mndSyncCheckTimeout
(
SMnode
*
pMnode
);
void
mndSyncStart
(
SMnode
*
pMnode
);
void
mndSyncStop
(
SMnode
*
pMnode
);
...
...
source/dnode/mnode/impl/src/mndMain.c
浏览文件 @
00fa4299
...
...
@@ -280,6 +280,7 @@ static void *mndThreadFp(void *param) {
if
(
sec
%
(
tsStatusInterval
*
5
)
==
0
)
{
mndCheckDnodeOffline
(
pMnode
);
mndSyncCheckTimeout
(
pMnode
);
}
}
...
...
source/dnode/mnode/impl/src/mndSync.c
浏览文件 @
00fa4299
...
...
@@ -17,6 +17,8 @@
#include "mndSync.h"
#include "mndTrans.h"
#define TRANS_TIMEOUT_SEC 10
static
int32_t
mndSyncEqCtrlMsg
(
const
SMsgCb
*
msgcb
,
SRpcMsg
*
pMsg
)
{
if
(
pMsg
==
NULL
||
pMsg
->
pCont
==
NULL
)
{
return
-
1
;
...
...
@@ -89,9 +91,9 @@ int32_t mndProcessWriteMsg(const SSyncFSM *pFsm, SRpcMsg *pMsg, const SFsmCbMeta
sdbSetApplyInfo
(
pMnode
->
pSdb
,
pMeta
->
index
,
pMeta
->
term
,
pMeta
->
lastConfigIndex
);
}
taos
WLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexLock
(
&
pMgmt
->
lock
);
if
(
transId
<=
0
)
{
taos
WUnLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
mError
(
"trans:%d, invalid commit msg"
,
transId
);
}
else
if
(
transId
==
pMgmt
->
transId
)
{
if
(
pMgmt
->
errCode
!=
0
)
{
...
...
@@ -100,10 +102,11 @@ int32_t mndProcessWriteMsg(const SSyncFSM *pFsm, SRpcMsg *pMsg, const SFsmCbMeta
mInfo
(
"trans:%d, is proposed and post sem"
,
transId
);
}
pMgmt
->
transId
=
0
;
pMgmt
->
transSec
=
0
;
tsem_post
(
&
pMgmt
->
syncSem
);
taos
WUnLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
}
else
{
taos
WUnLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
STrans
*
pTrans
=
mndAcquireTrans
(
pMnode
,
transId
);
if
(
pTrans
!=
NULL
)
{
mInfo
(
"trans:%d, execute in mnode which not leader"
,
transId
);
...
...
@@ -198,18 +201,19 @@ int32_t mndSnapshotDoWrite(const SSyncFSM *pFsm, void *pWriter, void *pBuf, int3
}
static
void
mndBecomeFollower
(
const
SSyncFSM
*
pFsm
)
{
SMnode
*
pMnode
=
pFsm
->
data
;
SMnode
*
pMnode
=
pFsm
->
data
;
SSyncMgmt
*
pMgmt
=
&
pMnode
->
syncMgmt
;
mInfo
(
"vgId:1, become follower"
);
taos
WLockLatch
(
&
pMnode
->
syncMgmt
.
lock
);
if
(
pM
node
->
syncMgmt
.
transId
!=
0
)
{
mInfo
(
"vgId:1, become follower and post sem, trans:%d, failed to propose since not leader"
,
pMnode
->
syncMgmt
.
transId
)
;
pM
node
->
syncMgmt
.
transId
=
0
;
pM
node
->
syncMgmt
.
errCode
=
TSDB_CODE_SYN_NOT_LEADER
;
tsem_post
(
&
pM
node
->
syncMgmt
.
syncSem
);
taos
ThreadMutexLock
(
&
pMgmt
->
lock
);
if
(
pM
gmt
->
transId
!=
0
)
{
mInfo
(
"vgId:1, become follower and post sem, trans:%d, failed to propose since not leader"
,
pMgmt
->
transId
);
pMgmt
->
transId
=
0
;
pM
gmt
->
transSec
=
0
;
pM
gmt
->
errCode
=
TSDB_CODE_SYN_NOT_LEADER
;
tsem_post
(
&
pM
gmt
->
syncSem
);
}
taos
WUnLockLatch
(
&
pMnode
->
syncMgmt
.
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
}
static
void
mndBecomeLeader
(
const
SSyncFSM
*
pFsm
)
{
...
...
@@ -265,8 +269,9 @@ SSyncFSM *mndSyncMakeFsm(SMnode *pMnode) {
int32_t
mndInitSync
(
SMnode
*
pMnode
)
{
SSyncMgmt
*
pMgmt
=
&
pMnode
->
syncMgmt
;
taos
InitRWLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexInit
(
&
pMgmt
->
lock
,
NULL
);
pMgmt
->
transId
=
0
;
pMgmt
->
transSec
=
0
;
SSyncInfo
syncInfo
=
{
.
snapshotStrategy
=
SYNC_STRATEGY_STANDARD_SNAPSHOT
,
...
...
@@ -313,9 +318,34 @@ void mndCleanupSync(SMnode *pMnode) {
mInfo
(
"mnode-sync is stopped, id:%"
PRId64
,
pMgmt
->
sync
);
tsem_destroy
(
&
pMgmt
->
syncSem
);
taosThreadMutexDestroy
(
&
pMgmt
->
lock
);
memset
(
pMgmt
,
0
,
sizeof
(
SSyncMgmt
));
}
void
mndSyncCheckTimeout
(
SMnode
*
pMnode
)
{
SSyncMgmt
*
pMgmt
=
&
pMnode
->
syncMgmt
;
taosThreadMutexLock
(
&
pMgmt
->
lock
);
if
(
pMgmt
->
transId
!=
0
)
{
int32_t
curSec
=
taosGetTimestampSec
();
int32_t
delta
=
curSec
-
pMgmt
->
transSec
;
if
(
delta
>
TRANS_TIMEOUT_SEC
)
{
mError
(
"trans:%d, failed to propose since timeout, start:%d cur:%d delta:%d"
,
pMgmt
->
transId
,
pMgmt
->
transSec
,
curSec
,
delta
);
pMgmt
->
transId
=
0
;
pMgmt
->
transSec
=
0
;
terrno
=
TSDB_CODE_SYN_TIMEOUT
;
pMgmt
->
errCode
=
TSDB_CODE_SYN_TIMEOUT
;
tsem_post
(
&
pMgmt
->
syncSem
);
}
else
{
mDebug
(
"trans:%d, waiting for sync confirm, start:%d cur:%d delta:%d"
,
pMgmt
->
transId
,
pMgmt
->
transSec
,
curSec
,
curSec
-
pMgmt
->
transSec
);
}
}
else
{
// mTrace("check sync timeout msg, no trans waiting for confirm");
}
taosThreadMutexUnlock
(
&
pMgmt
->
lock
);
}
int32_t
mndSyncPropose
(
SMnode
*
pMnode
,
SSdbRaw
*
pRaw
,
int32_t
transId
)
{
SSyncMgmt
*
pMgmt
=
&
pMnode
->
syncMgmt
;
pMgmt
->
errCode
=
0
;
...
...
@@ -327,35 +357,38 @@ int32_t mndSyncPropose(SMnode *pMnode, SSdbRaw *pRaw, int32_t transId) {
if
(
req
.
pCont
==
NULL
)
return
-
1
;
memcpy
(
req
.
pCont
,
pRaw
,
req
.
contLen
);
taos
WLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexLock
(
&
pMgmt
->
lock
);
if
(
pMgmt
->
transId
!=
0
)
{
mError
(
"trans:%d, can't be proposed since trans:%d already waiting for confirm"
,
transId
,
pMgmt
->
transId
);
taos
WUnLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
terrno
=
TSDB_CODE_MND_LAST_TRANS_NOT_FINISHED
;
return
-
1
;
return
terrno
;
}
mInfo
(
"trans:%d, will be proposed"
,
transId
);
pMgmt
->
transId
=
transId
;
taosWUnLockLatch
(
&
pMgmt
->
lock
);
pMgmt
->
transSec
=
taosGetTimestampSec
();
taosThreadMutexUnlock
(
&
pMgmt
->
lock
);
int32_t
code
=
syncPropose
(
pMgmt
->
sync
,
&
req
,
false
);
if
(
code
==
0
)
{
mInfo
(
"trans:%d, is proposing and wait sem"
,
pMgmt
->
transId
);
mInfo
(
"trans:%d, is proposing and wait sem"
,
transId
);
tsem_wait
(
&
pMgmt
->
syncSem
);
}
else
if
(
code
>
0
)
{
mInfo
(
"trans:%d, confirm at once since replica is 1, continue execute"
,
transId
);
taos
WLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexLock
(
&
pMgmt
->
lock
);
pMgmt
->
transId
=
0
;
taosWUnLockLatch
(
&
pMgmt
->
lock
);
pMgmt
->
transSec
=
0
;
taosThreadMutexUnlock
(
&
pMgmt
->
lock
);
sdbWriteWithoutFree
(
pMnode
->
pSdb
,
pRaw
);
sdbSetApplyInfo
(
pMnode
->
pSdb
,
req
.
info
.
conn
.
applyIndex
,
req
.
info
.
conn
.
applyTerm
,
SYNC_INDEX_INVALID
);
code
=
0
;
}
else
{
mError
(
"trans:%d, failed to proposed since %s"
,
transId
,
terrstr
());
taos
WLockLatch
(
&
pMgmt
->
lock
);
taos
ThreadMutexLock
(
&
pMgmt
->
lock
);
pMgmt
->
transId
=
0
;
taosWUnLockLatch
(
&
pMgmt
->
lock
);
pMgmt
->
transSec
=
0
;
taosThreadMutexUnlock
(
&
pMgmt
->
lock
);
if
(
terrno
==
0
)
{
terrno
=
TSDB_CODE_APP_ERROR
;
}
...
...
@@ -382,13 +415,17 @@ void mndSyncStart(SMnode *pMnode) {
}
void
mndSyncStop
(
SMnode
*
pMnode
)
{
taosWLockLatch
(
&
pMnode
->
syncMgmt
.
lock
);
if
(
pMnode
->
syncMgmt
.
transId
!=
0
)
{
mInfo
(
"vgId:1, is stopped and post sem, trans:%d"
,
pMnode
->
syncMgmt
.
transId
);
pMnode
->
syncMgmt
.
transId
=
0
;
tsem_post
(
&
pMnode
->
syncMgmt
.
syncSem
);
SSyncMgmt
*
pMgmt
=
&
pMnode
->
syncMgmt
;
taosThreadMutexLock
(
&
pMgmt
->
lock
);
if
(
pMgmt
->
transId
!=
0
)
{
mInfo
(
"vgId:1, is stopped and post sem, trans:%d"
,
pMgmt
->
transId
);
pMgmt
->
transId
=
0
;
pMgmt
->
transSec
=
0
;
pMgmt
->
errCode
=
TSDB_CODE_APP_IS_STOPPING
;
tsem_post
(
&
pMgmt
->
syncSem
);
}
taos
WUnLockLatch
(
&
pMnode
->
syncMgmt
.
lock
);
taos
ThreadMutexUnlock
(
&
pMgmt
->
lock
);
}
bool
mndIsLeader
(
SMnode
*
pMnode
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录