Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
469dfb9d
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
469dfb9d
编写于
12月 30, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: compile errors
上级
929be865
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
8 deletion
+8
-8
source/dnode/mgmt/node_util/src/dmEps.c
source/dnode/mgmt/node_util/src/dmEps.c
+2
-2
source/dnode/mnode/impl/src/mndSync.c
source/dnode/mnode/impl/src/mndSync.c
+1
-1
source/libs/sync/src/syncPipeline.c
source/libs/sync/src/syncPipeline.c
+2
-2
source/libs/sync/src/syncRaftCfg.c
source/libs/sync/src/syncRaftCfg.c
+2
-2
source/libs/sync/src/syncReplication.c
source/libs/sync/src/syncReplication.c
+1
-1
未找到文件。
source/dnode/mgmt/node_util/src/dmEps.c
浏览文件 @
469dfb9d
...
@@ -363,14 +363,14 @@ int32_t dmUpdateDnodeInfo(void *data, int32_t *dnodeId, int64_t *clusterId, char
...
@@ -363,14 +363,14 @@ int32_t dmUpdateDnodeInfo(void *data, int32_t *dnodeId, int64_t *clusterId, char
for
(
int32_t
i
=
0
;
i
<
(
int32_t
)
taosArrayGetSize
(
pData
->
dnodeEps
);
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
(
int32_t
)
taosArrayGetSize
(
pData
->
dnodeEps
);
++
i
)
{
SDnodeEp
*
pDnodeEp
=
taosArrayGet
(
pData
->
dnodeEps
,
i
);
SDnodeEp
*
pDnodeEp
=
taosArrayGet
(
pData
->
dnodeEps
,
i
);
if
(
strcmp
(
pDnodeEp
->
ep
.
fqdn
,
fqdn
)
==
0
&&
pDnodeEp
->
ep
.
port
==
*
port
)
{
if
(
strcmp
(
pDnodeEp
->
ep
.
fqdn
,
fqdn
)
==
0
&&
pDnodeEp
->
ep
.
port
==
*
port
)
{
dInfo
(
"dnode:%s:%u, update dnodeId from %d to %d"
,
fqdn
,
port
,
*
dnodeId
,
pDnodeEp
->
id
);
dInfo
(
"dnode:%s:%u, update dnodeId from %d to %d"
,
fqdn
,
*
port
,
*
dnodeId
,
pDnodeEp
->
id
);
*
dnodeId
=
pDnodeEp
->
id
;
*
dnodeId
=
pDnodeEp
->
id
;
*
clusterId
=
pData
->
clusterId
;
*
clusterId
=
pData
->
clusterId
;
ret
=
0
;
ret
=
0
;
}
}
}
}
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
dInfo
(
"dnode:%s:%u, failed to update dnodeId:%d"
,
fqdn
,
port
,
*
dnodeId
);
dInfo
(
"dnode:%s:%u, failed to update dnodeId:%d"
,
fqdn
,
*
port
,
*
dnodeId
);
}
}
}
else
{
}
else
{
SDnodeEp
*
pDnodeEp
=
taosHashGet
(
pData
->
dnodeHash
,
dnodeId
,
sizeof
(
int32_t
));
SDnodeEp
*
pDnodeEp
=
taosHashGet
(
pData
->
dnodeHash
,
dnodeId
,
sizeof
(
int32_t
));
...
...
source/dnode/mnode/impl/src/mndSync.c
浏览文件 @
469dfb9d
...
@@ -302,7 +302,7 @@ int32_t mndInitSync(SMnode *pMnode) {
...
@@ -302,7 +302,7 @@ int32_t mndInitSync(SMnode *pMnode) {
pNode
->
nodePort
=
pMgmt
->
replicas
[
i
].
port
;
pNode
->
nodePort
=
pMgmt
->
replicas
[
i
].
port
;
tstrncpy
(
pNode
->
nodeFqdn
,
pMgmt
->
replicas
[
i
].
fqdn
,
sizeof
(
pNode
->
nodeFqdn
));
tstrncpy
(
pNode
->
nodeFqdn
,
pMgmt
->
replicas
[
i
].
fqdn
,
sizeof
(
pNode
->
nodeFqdn
));
(
void
)
tmsgUpdateDnodeInfo
(
&
pNode
->
nodeId
,
&
pNode
->
clusterId
,
pNode
->
nodeFqdn
,
&
pNode
->
nodePort
);
(
void
)
tmsgUpdateDnodeInfo
(
&
pNode
->
nodeId
,
&
pNode
->
clusterId
,
pNode
->
nodeFqdn
,
&
pNode
->
nodePort
);
mInfo
(
"vgId:1, index:%d ep:%s:%u dnode:%d cluster:"
PRId64
,
i
,
pNode
->
nodeFqdn
,
pNode
->
nodePort
,
pNode
->
nodeId
,
mInfo
(
"vgId:1, index:%d ep:%s:%u dnode:%d cluster:
%
"
PRId64
,
i
,
pNode
->
nodeFqdn
,
pNode
->
nodePort
,
pNode
->
nodeId
,
pNode
->
clusterId
);
pNode
->
clusterId
);
}
}
...
...
source/libs/sync/src/syncPipeline.c
浏览文件 @
469dfb9d
...
@@ -704,10 +704,10 @@ int32_t syncLogReplMgrProcessReplyInRecoveryMode(SSyncLogReplMgr* pMgr, SSyncNod
...
@@ -704,10 +704,10 @@ int32_t syncLogReplMgrProcessReplyInRecoveryMode(SSyncLogReplMgr* pMgr, SSyncNod
if
(
term
<
0
||
(
term
!=
pMsg
->
lastMatchTerm
&&
(
index
+
1
==
firstVer
||
index
==
firstVer
)))
{
if
(
term
<
0
||
(
term
!=
pMsg
->
lastMatchTerm
&&
(
index
+
1
==
firstVer
||
index
==
firstVer
)))
{
ASSERT
(
term
>=
0
||
terrno
==
TSDB_CODE_WAL_LOG_NOT_EXIST
);
ASSERT
(
term
>=
0
||
terrno
==
TSDB_CODE_WAL_LOG_NOT_EXIST
);
if
(
syncNodeStartSnapshot
(
pNode
,
&
destId
)
<
0
)
{
if
(
syncNodeStartSnapshot
(
pNode
,
&
destId
)
<
0
)
{
sError
(
"vgId:%d, failed to start snapshot for peer
%s
:%d"
,
pNode
->
vgId
,
DID
(
&
destId
));
sError
(
"vgId:%d, failed to start snapshot for peer
dnode
:%d"
,
pNode
->
vgId
,
DID
(
&
destId
));
return
-
1
;
return
-
1
;
}
}
sInfo
(
"vgId:%d, snapshot replication to peer
%s
:%d"
,
pNode
->
vgId
,
DID
(
&
destId
));
sInfo
(
"vgId:%d, snapshot replication to peer
dnode
:%d"
,
pNode
->
vgId
,
DID
(
&
destId
));
return
0
;
return
0
;
}
}
...
...
source/libs/sync/src/syncRaftCfg.c
浏览文件 @
469dfb9d
...
@@ -74,7 +74,7 @@ int32_t syncWriteCfgFile(SSyncNode *pNode) {
...
@@ -74,7 +74,7 @@ int32_t syncWriteCfgFile(SSyncNode *pNode) {
pFile
=
taosOpenFile
(
file
,
TD_FILE_CREATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
pFile
=
taosOpenFile
(
file
,
TD_FILE_CREATE
|
TD_FILE_WRITE
|
TD_FILE_TRUNC
);
if
(
pFile
==
NULL
)
{
if
(
pFile
==
NULL
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
sError
(
"failed to open sync cfg file:%s since %s"
,
pNode
->
vgId
,
realfile
,
terrstr
());
sError
(
"
vgId:%d,
failed to open sync cfg file:%s since %s"
,
pNode
->
vgId
,
realfile
,
terrstr
());
goto
_OVER
;
goto
_OVER
;
}
}
...
@@ -106,7 +106,7 @@ _OVER:
...
@@ -106,7 +106,7 @@ _OVER:
if
(
pFile
!=
NULL
)
taosCloseFile
(
&
pFile
);
if
(
pFile
!=
NULL
)
taosCloseFile
(
&
pFile
);
if
(
code
!=
0
)
{
if
(
code
!=
0
)
{
sError
(
"failed to write sync cfg file:%s since %s"
,
pNode
->
vgId
,
realfile
,
terrstr
());
sError
(
"
vgId:%d,
failed to write sync cfg file:%s since %s"
,
pNode
->
vgId
,
realfile
,
terrstr
());
}
}
return
code
;
return
code
;
}
}
...
...
source/libs/sync/src/syncReplication.c
浏览文件 @
469dfb9d
...
@@ -168,7 +168,7 @@ int32_t syncNodeReplicateOld(SSyncNode* pSyncNode) {
...
@@ -168,7 +168,7 @@ int32_t syncNodeReplicateOld(SSyncNode* pSyncNode) {
SRaftId
*
pDestId
=
&
(
pSyncNode
->
peersId
[
i
]);
SRaftId
*
pDestId
=
&
(
pSyncNode
->
peersId
[
i
]);
ret
=
syncNodeReplicateOne
(
pSyncNode
,
pDestId
,
true
);
ret
=
syncNodeReplicateOne
(
pSyncNode
,
pDestId
,
true
);
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
sError
(
"vgId:%d, do append entries error for
%s
:%d"
,
pSyncNode
->
vgId
,
DID
(
pDestId
));
sError
(
"vgId:%d, do append entries error for
dnode
:%d"
,
pSyncNode
->
vgId
,
DID
(
pDestId
));
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录