Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
edef93be
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看板
提交
edef93be
编写于
9月 07, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '3.0' of
https://github.com/taosdata/TDengine
into refact/tsdb_new_snapshot
上级
3cc29d77
e0d5ec39
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
757 addition
and
95 deletion
+757
-95
cmake/taosadapter_CMakeLists.txt.in
cmake/taosadapter_CMakeLists.txt.in
+1
-1
docs/zh/28-releases/02-tools.md
docs/zh/28-releases/02-tools.md
+4
-0
include/common/tmsgdef.h
include/common/tmsgdef.h
+2
-0
include/libs/sync/syncTools.h
include/libs/sync/syncTools.h
+64
-0
packaging/MPtestJenkinsfile
packaging/MPtestJenkinsfile
+60
-45
packaging/checkPackageRuning.py
packaging/checkPackageRuning.py
+15
-8
packaging/debRpmAutoInstall.sh
packaging/debRpmAutoInstall.sh
+2
-0
packaging/testpackage.sh
packaging/testpackage.sh
+70
-41
source/libs/sync/src/syncMessage.c
source/libs/sync/src/syncMessage.c
+307
-0
source/libs/sync/test/CMakeLists.txt
source/libs/sync/test/CMakeLists.txt
+28
-0
source/libs/sync/test/syncHeartbeatReplyTest.cpp
source/libs/sync/test/syncHeartbeatReplyTest.cpp
+105
-0
source/libs/sync/test/syncHeartbeatTest.cpp
source/libs/sync/test/syncHeartbeatTest.cpp
+99
-0
未找到文件。
cmake/taosadapter_CMakeLists.txt.in
浏览文件 @
edef93be
...
...
@@ -2,7 +2,7 @@
# taosadapter
ExternalProject_Add(taosadapter
GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
GIT_TAG
22bdac5
GIT_TAG
71e7ccf
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
...
...
docs/zh/28-releases/02-tools.md
浏览文件 @
edef93be
...
...
@@ -6,6 +6,10 @@ description: taosTools 的发布历史、Release Notes 和下载链接
import Release from "/components/ReleaseV3";
## 2.1.3
<Release
type=
"tools"
version=
"2.1.3"
/>
## 2.1.2
<Release
type=
"tools"
version=
"2.1.2"
/>
\ No newline at end of file
include/common/tmsgdef.h
浏览文件 @
edef93be
...
...
@@ -261,6 +261,8 @@ enum {
TD_DEF_MSG_TYPE
(
TDMT_SYNC_APPEND_ENTRIES
,
"sync-append-entries"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_APPEND_ENTRIES_BATCH
,
"sync-append-entries-batch"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_APPEND_ENTRIES_REPLY
,
"sync-append-entries-reply"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_HEARTBEAT
,
"sync-heartbeat"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_HEARTBEAT_REPLY
,
"sync-heartbeat-reply"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_NOOP
,
"sync-noop"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_UNKNOWN
,
"sync-unknown"
,
NULL
,
NULL
)
TD_DEF_MSG_TYPE
(
TDMT_SYNC_COMMON_RESPONSE
,
"sync-common-response"
,
NULL
,
NULL
)
...
...
include/libs/sync/syncTools.h
浏览文件 @
edef93be
...
...
@@ -444,6 +444,70 @@ void syncAppendEntriesReplyPrint2(char* s, const SyncAppendEntriesReply* pMsg);
void
syncAppendEntriesReplyLog
(
const
SyncAppendEntriesReply
*
pMsg
);
void
syncAppendEntriesReplyLog2
(
char
*
s
,
const
SyncAppendEntriesReply
*
pMsg
);
// ---------------------------------------------
typedef
struct
SyncHeartbeat
{
uint32_t
bytes
;
int32_t
vgId
;
uint32_t
msgType
;
SRaftId
srcId
;
SRaftId
destId
;
// private data
SyncTerm
term
;
SyncIndex
commitIndex
;
SyncTerm
privateTerm
;
}
SyncHeartbeat
;
SyncHeartbeat
*
syncHeartbeatBuild
(
int32_t
vgId
);
void
syncHeartbeatDestroy
(
SyncHeartbeat
*
pMsg
);
void
syncHeartbeatSerialize
(
const
SyncHeartbeat
*
pMsg
,
char
*
buf
,
uint32_t
bufLen
);
void
syncHeartbeatDeserialize
(
const
char
*
buf
,
uint32_t
len
,
SyncHeartbeat
*
pMsg
);
char
*
syncHeartbeatSerialize2
(
const
SyncHeartbeat
*
pMsg
,
uint32_t
*
len
);
SyncHeartbeat
*
syncHeartbeatDeserialize2
(
const
char
*
buf
,
uint32_t
len
);
void
syncHeartbeat2RpcMsg
(
const
SyncHeartbeat
*
pMsg
,
SRpcMsg
*
pRpcMsg
);
void
syncHeartbeatFromRpcMsg
(
const
SRpcMsg
*
pRpcMsg
,
SyncHeartbeat
*
pMsg
);
SyncHeartbeat
*
syncHeartbeatFromRpcMsg2
(
const
SRpcMsg
*
pRpcMsg
);
cJSON
*
syncHeartbeat2Json
(
const
SyncHeartbeat
*
pMsg
);
char
*
syncHeartbeat2Str
(
const
SyncHeartbeat
*
pMsg
);
// for debug ----------------------
void
syncHeartbeatPrint
(
const
SyncHeartbeat
*
pMsg
);
void
syncHeartbeatPrint2
(
char
*
s
,
const
SyncHeartbeat
*
pMsg
);
void
syncHeartbeatLog
(
const
SyncHeartbeat
*
pMsg
);
void
syncHeartbeatLog2
(
char
*
s
,
const
SyncHeartbeat
*
pMsg
);
// ---------------------------------------------
typedef
struct
SyncHeartbeatReply
{
uint32_t
bytes
;
int32_t
vgId
;
uint32_t
msgType
;
SRaftId
srcId
;
SRaftId
destId
;
// private data
SyncTerm
term
;
SyncTerm
privateTerm
;
int64_t
startTime
;
}
SyncHeartbeatReply
;
SyncHeartbeatReply
*
syncHeartbeatReplyBuild
(
int32_t
vgId
);
void
syncHeartbeatReplyDestroy
(
SyncHeartbeatReply
*
pMsg
);
void
syncHeartbeatReplySerialize
(
const
SyncHeartbeatReply
*
pMsg
,
char
*
buf
,
uint32_t
bufLen
);
void
syncHeartbeatReplyDeserialize
(
const
char
*
buf
,
uint32_t
len
,
SyncHeartbeatReply
*
pMsg
);
char
*
syncHeartbeatReplySerialize2
(
const
SyncHeartbeatReply
*
pMsg
,
uint32_t
*
len
);
SyncHeartbeatReply
*
syncHeartbeatReplyDeserialize2
(
const
char
*
buf
,
uint32_t
len
);
void
syncHeartbeatReply2RpcMsg
(
const
SyncHeartbeatReply
*
pMsg
,
SRpcMsg
*
pRpcMsg
);
void
syncHeartbeatReplyFromRpcMsg
(
const
SRpcMsg
*
pRpcMsg
,
SyncHeartbeatReply
*
pMsg
);
SyncHeartbeatReply
*
syncHeartbeatReplyFromRpcMsg2
(
const
SRpcMsg
*
pRpcMsg
);
cJSON
*
syncHeartbeatReply2Json
(
const
SyncHeartbeatReply
*
pMsg
);
char
*
syncHeartbeatReply2Str
(
const
SyncHeartbeatReply
*
pMsg
);
// for debug ----------------------
void
syncHeartbeatReplyPrint
(
const
SyncHeartbeatReply
*
pMsg
);
void
syncHeartbeatReplyPrint2
(
char
*
s
,
const
SyncHeartbeatReply
*
pMsg
);
void
syncHeartbeatReplyLog
(
const
SyncHeartbeatReply
*
pMsg
);
void
syncHeartbeatReplyLog2
(
char
*
s
,
const
SyncHeartbeatReply
*
pMsg
);
// ---------------------------------------------
typedef
struct
SyncApplyMsg
{
uint32_t
bytes
;
...
...
packaging/MPtestJenkinsfile
浏览文件 @
edef93be
...
...
@@ -5,13 +5,6 @@ def sync_source(branch_name) {
echo ''' + branch_name + '''
'''
sh '''
cd ${TDINTERNAL_ROOT_DIR}
git reset --hard
git fetch || git fetch
git checkout ''' + branch_name + ''' -f
git branch
git pull || git pull
git log | head -n 20
cd ${TDENGINE_ROOT_DIR}
git reset --hard
git fetch || git fetch
...
...
@@ -64,17 +57,12 @@ pipeline {
defaultValue:'2.1.2',
description: 'This number of baseVerison is generally not modified.Now it is 3.0.0.1'
)
string (
name:'nasPassword',
defaultValue:'password',
description: 'the pasword of the NAS server which has installPackage-192.168.1.131'
)
}
environment{
WORK_DIR = '/var/lib/jenkins/workspace'
TDINTERNAL_ROOT_DIR = '/var/lib/jenkins/workspace/TDinternal'
TDENGINE_ROOT_DIR = '/var/lib/jenkins/workspace/TDinternal/community'
BRANCH_NAME = '
3.0
'
BRANCH_NAME = '
test/chr/TD-14699
'
TD_SERVER_TAR = "TDengine-server-${version}-Linux-x64.tar.gz"
BASE_TD_SERVER_TAR = "TDengine-server-${baseVersion}-Linux-x64.tar.gz"
...
...
@@ -107,7 +95,7 @@ pipeline {
}
stages {
stage ('
RUN
') {
stage ('
Test Server
') {
parallel {
stage('ubuntu16') {
agent{label " ubuntu16 "}
...
...
@@ -116,17 +104,17 @@ pipeline {
sync_source("${BRANCH_NAME}")
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_DEB} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_DEB} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
}
...
...
@@ -139,24 +127,21 @@ pipeline {
sync_source("${BRANCH_NAME}")
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server ${nasPassword}
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server ${nasPassword}
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_
DEB} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server ${nasPassword}
bash testpackage.sh ${TD_SERVER_
LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_
CLIENT_TAR} ${version} ${BASE_TD_CLIENT_TAR} ${baseVersion} client ${nasPassword}
bash testpackage.sh ${TD_
SERVER_DEB} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
dpkg -r tdengine
'''
}
}
}
...
...
@@ -167,17 +152,17 @@ pipeline {
sync_source("${BRANCH_NAME}")
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_RPM} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_RPM} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
}
...
...
@@ -190,28 +175,23 @@ pipeline {
sync_source("${BRANCH_NAME}")
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_RPM} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server ${nasPassword}
python3 checkPackageRuning.py
'''
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_CLIENT_LITE_TAR} ${version} ${BASE_TD_CLIENT_LITE_TAR} ${baseVersion} client ${nasPassword}
bash testpackage.sh ${TD_SERVER_RPM} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
sudo rpm -e tdengine
'''
}
}
}
}
stage('arm64') {
agent{label 'linux_arm64'}
steps {
...
...
@@ -219,18 +199,53 @@ pipeline {
sync_source("${BRANCH_NAME}")
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_SERVER_ARM_TAR} ${version} ${BASE_TD_SERVER_ARM_TAR} ${baseVersion} server
${nasPassword}
bash testpackage.sh ${TD_SERVER_ARM_TAR} ${version} ${BASE_TD_SERVER_ARM_TAR} ${baseVersion} server
python3 checkPackageRuning.py
'''
}
}
}
}
}
stage ('Test Client') {
parallel {
stage('ubuntu18') {
agent{label " ubuntu18 "}
steps {
timeout(time: 30, unit: 'MINUTES'){
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_CLIENT_
ARM_TAR} ${version} ${BASE_TD_CLIENT_ARM_TAR} ${baseVersion} client ${nasPassword}
python3 checkPackageRuning.py
'''
bash testpackage.sh ${TD_CLIENT_
TAR} ${version} ${BASE_TD_CLIENT_TAR} ${baseVersion} client
python3 checkPackageRuning.py
192.168.0.21
'''
}
}
}
stage('centos8') {
agent{label " centos8_3 "}
steps {
timeout(time: 30, unit: 'MINUTES'){
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_CLIENT_LITE_TAR} ${version} ${BASE_TD_CLIENT_LITE_TAR} ${baseVersion} client
python3 checkPackageRuning.py 192.168.0.24
'''
}
}
}
}
}
}
}
stage('arm64-client') {
agent{label " linux_arm64 "}
steps {
timeout(time: 30, unit: 'MINUTES'){
sh '''
cd ${TDENGINE_ROOT_DIR}/packaging
bash testpackage.sh ${TD_CLIENT_ARM_TAR} ${version} ${BASE_TD_CLIENT_ARM_TAR} ${baseVersion} client
python3 checkPackageRuning.py 192.168.0.21
'''
}
}
}
}
}
\ No newline at end of file
packaging/checkPackageRuning.py
浏览文件 @
edef93be
...
...
@@ -19,12 +19,19 @@ import subprocess
# from this import d
import
time
if
(
len
(
sys
.
argv
)
>
1
):
serverHost
=
sys
.
argv
[
1
]
else
:
serverHost
=
"localhost"
# install taospy
out
=
subprocess
.
getoutput
(
"pip3 show taospy|grep Version| awk -F ':' '{print $2}' "
)
print
(
"taospy version %s "
%
out
)
if
(
out
==
""
):
os
.
system
(
"pip install git+https://github.com/taosdata/taos-connector-python.git"
)
os
.
system
(
"pip
3
install git+https://github.com/taosdata/taos-connector-python.git"
)
print
(
"install taos python connector"
)
else
:
os
.
system
(
"pip3 install --upgrade taospy "
)
...
...
@@ -32,19 +39,19 @@ else:
# start taosd prepare
os
.
system
(
"rm -rf /var/lib/taos/*"
)
os
.
system
(
"systemctl restart taosd "
)
#
os.system("rm -rf /var/lib/taos/*")
#
os.system("systemctl restart taosd ")
# wait a moment ,at least 5 seconds
time
.
sleep
(
5
)
# prepare data by taosBenchmark
os
.
system
(
"taosBenchmark -y -n 100 -t 100
"
)
os
.
system
(
"taosBenchmark -y -n 100 -t 100
-h %s "
%
serverHost
)
import
taos
conn
=
taos
.
connect
(
host
=
"
localhost"
,
conn
=
taos
.
connect
(
host
=
"
%s"
%
serverHost
,
user
=
"root"
,
password
=
"taosdata"
,
database
=
"test"
,
...
...
@@ -80,15 +87,15 @@ os.system("rm -rf /tmp/dumpdata/*")
# dump data out
print
(
"taosdump dump out data"
)
os
.
system
(
"taosdump -o /tmp/dumpdata -D test -y
"
)
os
.
system
(
"taosdump -o /tmp/dumpdata -D test -y
-h %s "
%
serverHost
)
# drop database of test
print
(
"drop database test"
)
os
.
system
(
" taos -s ' drop database test ;'
"
)
os
.
system
(
" taos -s ' drop database test ;'
-h %s "
%
serverHost
)
# dump data in
print
(
"taosdump dump data in"
)
os
.
system
(
"taosdump -i /tmp/dumpdata -y
"
)
os
.
system
(
"taosdump -i /tmp/dumpdata -y
-h %s "
%
serverHost
)
result
=
conn
.
query
(
"SELECT count(*) from test.meters"
)
...
...
packaging/debRpmAutoInstall.sh
浏览文件 @
edef93be
...
...
@@ -11,3 +11,5 @@ expect "*one:"
send
"
\r
"
expect
"*skip:"
send
"
\r
"
expect eof
\ No newline at end of file
packaging/testpackage.sh
浏览文件 @
edef93be
...
...
@@ -68,11 +68,37 @@ fi
}
function
wgetFile
{
file
=
$1
if
[
!
-f
${
file
}
]
;
then
echoColor BD
"wget https://www.taosdata.com/assets-download/3.0/
${
file
}
"
wget https://www.taosdata.com/assets-download/3.0/
${
file
}
else
echoColor YD
"
${
file
}
already exists "
fi
}
function
newPath
{
buildPath
=
$1
if
[
!
-d
${
buildPath
}
]
;
then
echoColor BD
"mkdir -p
${
buildPath
}
"
mkdir
-p
${
buildPath
}
else
echoColor YD
"
${
buildPath
}
already exists"
fi
}
echoColor G
"===== install basesoft ====="
cmdInstall tree
cmdInstall wget
cmdInstall
sshpass
cmdInstall
expect
echoColor G
"===== Uninstall all components of TDeingne ====="
...
...
@@ -97,45 +123,28 @@ echoColor G "===== new workroom path ====="
installPath
=
"/usr/local/src/packageTest"
oriInstallPath
=
"/usr/local/src/packageTest/3.1"
if
[
!
-d
${
installPath
}
]
;
then
echoColor BD
"mkdir -p
${
installPath
}
"
mkdir
-p
${
installPath
}
else
echoColor YD
"
${
installPath
}
already exists"
fi
newPath
${
installPath
}
if
[
-d
${
installPath
}
/
${
tdPath
}
]
;
then
echoColor BD
"rm -rf
${
installPath
}
/
${
tdPath
}
/*"
rm
-rf
${
installPath
}
/
${
tdPath
}
/
*
fi
newPath
${
oriInstallPath
}
if
[
!
-d
${
oriInstallPath
}
]
;
then
echoColor BD
"mkdir -p
${
oriInstallPath
}
"
mkdir
-p
${
oriInstallPath
}
else
echoColor YD
"
${
oriInstallPath
}
already exists"
fi
if
[
-d
${
oriInstallPath
}
/
${
originTdpPath
}
]
;
then
echoColor BD
"rm -rf
${
oriInstallPath
}
/
${
originTdpPath
}
/*"
rm
-rf
${
oriInstallPath
}
/
${
originTdpPath
}
/
*
fi
if
[
-d
${
installPath
}
/
${
tdPath
}
]
;
then
echoColor BD
"rm -rf
${
installPath
}
/
${
tdPath
}
/*"
rm
-rf
${
installPath
}
/
${
tdPath
}
/
*
fi
echoColor G
"===== download installPackage ====="
# cd ${installPath}
# wget https://www.taosdata.com/assets-download/3.0/${packgeName}
# cd ${oriInstallPath}
# wget https://www.taosdata.com/assets-download/3.0/${originPackageName}
cd
${
installPath
}
&&
wgetFile
${
packgeName
}
cd
${
oriInstallPath
}
&&
wgetFile
${
originPackageName
}
cd
${
installPath
}
cp
-r
${
scriptDir
}
/debRpmAutoInstall.sh
.
if
[
!
-f
{
packgeName
}
]
;
then
echoColor BD
"sshpass -p
${
password
}
scp -oStrictHostKeyChecking=no 192.168.1.131:/nas/TDengine3/v
${
version
}
/community/
${
packgeName
}
."
sshpass
-p
${
password
}
scp
-oStrictHostKeyChecking
=
no
-oStrictHostKeyChecking
=
no 192.168.1.131:/nas/TDengine3/v
${
version
}
/community/
${
packgeName
}
.
fi
packageSuffix
=
$(
echo
${
packgeName
}
|
awk
-F
'.'
'{print $NF}'
)
...
...
@@ -181,8 +190,7 @@ elif [[ ${packgeName} =~ "tar" ]];then
cd
${
oriInstallPath
}
if
[
!
-f
{
originPackageName
}
]
;
then
echoColor YD
"download base installPackage"
echoColor BD
"sshpass -p
${
password
}
scp -oStrictHostKeyChecking=no 192.168.1.131:/nas/TDengine3/v
${
originversion
}
/community/
${
originPackageName
}
."
sshpass
-p
${
password
}
scp
-oStrictHostKeyChecking
=
no 192.168.1.131:/nas/TDengine3/v
${
originversion
}
/community/
${
originPackageName
}
.
wgetFile
${
originPackageName
}
fi
echoColor YD
"unzip the base installation package"
echoColor BD
"tar -xf
${
originPackageName
}
"
&&
tar
-xf
${
originPackageName
}
...
...
@@ -222,24 +230,45 @@ fi
cd
${
installPath
}
if
([[
${
packgeName
}
=
~
"Lite"
]]
&&
[[
${
packgeName
}
=
~
"tar"
]])
||
[[
${
packgeName
}
=
~
"client"
]]
;
then
echoColor G
"===== install taos-tools when package is lite or client ====="
cd
${
installPath
}
sshpass
-p
${
password
}
scp
-oStrictHostKeyChecking
=
no 192.168.1.131:/nas/TDengine3/v
${
version
}
/community/taosTools-2.1.2-Linux-x64.tar.gz
.
# wget https://www.taosdata.com/assets-download/3.0/taosTools-2.1.2-Linux-x64.tar.gz
tar
xf taosTools-2.1.2-Linux-x64.tar.gz
cd
taosTools-2.1.2
&&
bash install-taostools.sh
elif
[[
${
packgeName
}
=
~
"Lite"
]]
&&
[[
${
packgeName
}
=
~
"deb"
]]
;
then
if
[[
${
packgeName
}
=
~
"Lite"
]]
||
([[
${
packgeName
}
=
~
"x64"
]]
&&
[[
${
packgeName
}
=
~
"client"
]])
||
([[
${
packgeName
}
=
~
"deb"
]]
&&
[[
${
packgeName
}
=
~
"server"
]])
||
([[
${
packgeName
}
=
~
"rpm"
]]
&&
[[
${
packgeName
}
=
~
"server"
]])
;
then
echoColor G
"===== install taos-tools when package is lite or client ====="
cd
${
installPath
}
sshpass
-p
${
password
}
scp
-oStrictHostKeyChecking
=
no 192.168.1.131:/nas/TDengine3/v
${
version
}
/community/
taosTools-2.1.2-Linux-x64.tar.gz
.
wgetFile
taosTools-2.1.2-Linux-x64.tar.gz
.
tar
xf taosTools-2.1.2-Linux-x64.tar.gz
cd
taosTools-2.1.2
&&
bash install-taostools.sh
elif
[[
${
packgeName
}
=
~
"Lite"
]]
&&
[[
${
packgeName
}
=
~
"rpm"
]]
;
then
echoColor G
"===== install taos-tools
when package is lite or
client ====="
elif
([[
${
packgeName
}
=
~
"arm64"
]]
&&
[[
${
packgeName
}
=
~
"client"
]])
;
then
echoColor G
"===== install taos-tools
arm when package is arm64-
client ====="
cd
${
installPath
}
sshpass
-p
${
password
}
scp
-oStrictHostKeyChecking
=
no
-oStrictHostKeyChecking
=
no 192.168.1.131:/nas/TDengine3/v
${
version
}
/community/taosTools-2.1.2-Linux-x
64.tar.gz
.
tar
xf taosTools-2.1.2-Linux-
x
64.tar.gz
wgetFile taosTools-2.1.2-Linux-arm
64.tar.gz
.
tar
xf taosTools-2.1.2-Linux-
arm
64.tar.gz
cd
taosTools-2.1.2
&&
bash install-taostools.sh
fi
echoColor G
"===== start TDengine ====="
if
[[
${
packgeName
}
=
~
"server"
]]
;
then
echoColor BD
" rm -rf /var/lib/taos/* && systemctl restart taosd "
rm
-rf
/var/lib/taos/
*
systemctl restart taosd
fi
# if ([[ ${packgeName} =~ "Lite" ]] && [[ ${packgeName} =~ "tar" ]]) || [[ ${packgeName} =~ "client" ]] ;then
# echoColor G "===== install taos-tools when package is lite or client ====="
# cd ${installPath}
# wgetFile taosTools-2.1.2-Linux-x64.tar.gz .
# tar xf taosTools-2.1.2-Linux-x64.tar.gz
# cd taosTools-2.1.2 && bash install-taostools.sh
# elif [[ ${packgeName} =~ "Lite" ]] && [[ ${packgeName} =~ "deb" ]] ;then
# echoColor G "===== install taos-tools when package is lite or client ====="
# cd ${installPath}
# wgetFile taosTools-2.1.2-Linux-x64.tar.gz .
# tar xf taosTools-2.1.2-Linux-x64.tar.gz
# cd taosTools-2.1.2 && bash install-taostools.sh
# elif [[ ${packgeName} =~ "Lite" ]] && [[ ${packgeName} =~ "rpm" ]] ;then
# echoColor G "===== install taos-tools when package is lite or client ====="
# cd ${installPath}
# wgetFile taosTools-2.1.2-Linux-x64.tar.gz .
# tar xf taosTools-2.1.2-Linux-x64.tar.gz
# cd taosTools-2.1.2 && bash install-taostools.sh
# fi
source/libs/sync/src/syncMessage.c
浏览文件 @
edef93be
...
...
@@ -1992,6 +1992,313 @@ void syncAppendEntriesReplyLog2(char* s, const SyncAppendEntriesReply* pMsg) {
}
}
// ---- message process SyncHeartbeat----
SyncHeartbeat
*
syncHeartbeatBuild
(
int32_t
vgId
)
{
uint32_t
bytes
=
sizeof
(
SyncHeartbeat
);
SyncHeartbeat
*
pMsg
=
taosMemoryMalloc
(
bytes
);
memset
(
pMsg
,
0
,
bytes
);
pMsg
->
bytes
=
bytes
;
pMsg
->
vgId
=
vgId
;
pMsg
->
msgType
=
TDMT_SYNC_HEARTBEAT
;
return
pMsg
;
}
void
syncHeartbeatDestroy
(
SyncHeartbeat
*
pMsg
)
{
if
(
pMsg
!=
NULL
)
{
taosMemoryFree
(
pMsg
);
}
}
void
syncHeartbeatSerialize
(
const
SyncHeartbeat
*
pMsg
,
char
*
buf
,
uint32_t
bufLen
)
{
ASSERT
(
pMsg
->
bytes
<=
bufLen
);
memcpy
(
buf
,
pMsg
,
pMsg
->
bytes
);
}
void
syncHeartbeatDeserialize
(
const
char
*
buf
,
uint32_t
len
,
SyncHeartbeat
*
pMsg
)
{
memcpy
(
pMsg
,
buf
,
len
);
ASSERT
(
len
==
pMsg
->
bytes
);
}
char
*
syncHeartbeatSerialize2
(
const
SyncHeartbeat
*
pMsg
,
uint32_t
*
len
)
{
char
*
buf
=
taosMemoryMalloc
(
pMsg
->
bytes
);
ASSERT
(
buf
!=
NULL
);
syncHeartbeatSerialize
(
pMsg
,
buf
,
pMsg
->
bytes
);
if
(
len
!=
NULL
)
{
*
len
=
pMsg
->
bytes
;
}
return
buf
;
}
SyncHeartbeat
*
syncHeartbeatDeserialize2
(
const
char
*
buf
,
uint32_t
len
)
{
uint32_t
bytes
=
*
((
uint32_t
*
)
buf
);
SyncHeartbeat
*
pMsg
=
taosMemoryMalloc
(
bytes
);
ASSERT
(
pMsg
!=
NULL
);
syncHeartbeatDeserialize
(
buf
,
len
,
pMsg
);
ASSERT
(
len
==
pMsg
->
bytes
);
return
pMsg
;
}
void
syncHeartbeat2RpcMsg
(
const
SyncHeartbeat
*
pMsg
,
SRpcMsg
*
pRpcMsg
)
{
memset
(
pRpcMsg
,
0
,
sizeof
(
*
pRpcMsg
));
pRpcMsg
->
msgType
=
pMsg
->
msgType
;
pRpcMsg
->
contLen
=
pMsg
->
bytes
;
pRpcMsg
->
pCont
=
rpcMallocCont
(
pRpcMsg
->
contLen
);
syncHeartbeatSerialize
(
pMsg
,
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
);
}
void
syncHeartbeatFromRpcMsg
(
const
SRpcMsg
*
pRpcMsg
,
SyncHeartbeat
*
pMsg
)
{
syncHeartbeatDeserialize
(
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
,
pMsg
);
}
SyncHeartbeat
*
syncHeartbeatFromRpcMsg2
(
const
SRpcMsg
*
pRpcMsg
)
{
SyncHeartbeat
*
pMsg
=
syncHeartbeatDeserialize2
(
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
);
ASSERT
(
pMsg
!=
NULL
);
return
pMsg
;
}
cJSON
*
syncHeartbeat2Json
(
const
SyncHeartbeat
*
pMsg
)
{
char
u64buf
[
128
]
=
{
0
};
cJSON
*
pRoot
=
cJSON_CreateObject
();
if
(
pMsg
!=
NULL
)
{
cJSON_AddNumberToObject
(
pRoot
,
"bytes"
,
pMsg
->
bytes
);
cJSON_AddNumberToObject
(
pRoot
,
"vgId"
,
pMsg
->
vgId
);
cJSON_AddNumberToObject
(
pRoot
,
"msgType"
,
pMsg
->
msgType
);
cJSON
*
pSrcId
=
cJSON_CreateObject
();
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
srcId
.
addr
);
cJSON_AddStringToObject
(
pSrcId
,
"addr"
,
u64buf
);
{
uint64_t
u64
=
pMsg
->
srcId
.
addr
;
cJSON
*
pTmp
=
pSrcId
;
char
host
[
128
]
=
{
0
};
uint16_t
port
;
syncUtilU642Addr
(
u64
,
host
,
sizeof
(
host
),
&
port
);
cJSON_AddStringToObject
(
pTmp
,
"addr_host"
,
host
);
cJSON_AddNumberToObject
(
pTmp
,
"addr_port"
,
port
);
}
cJSON_AddNumberToObject
(
pSrcId
,
"vgId"
,
pMsg
->
srcId
.
vgId
);
cJSON_AddItemToObject
(
pRoot
,
"srcId"
,
pSrcId
);
cJSON
*
pDestId
=
cJSON_CreateObject
();
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
destId
.
addr
);
cJSON_AddStringToObject
(
pDestId
,
"addr"
,
u64buf
);
{
uint64_t
u64
=
pMsg
->
destId
.
addr
;
cJSON
*
pTmp
=
pDestId
;
char
host
[
128
]
=
{
0
};
uint16_t
port
;
syncUtilU642Addr
(
u64
,
host
,
sizeof
(
host
),
&
port
);
cJSON_AddStringToObject
(
pTmp
,
"addr_host"
,
host
);
cJSON_AddNumberToObject
(
pTmp
,
"addr_port"
,
port
);
}
cJSON_AddNumberToObject
(
pDestId
,
"vgId"
,
pMsg
->
destId
.
vgId
);
cJSON_AddItemToObject
(
pRoot
,
"destId"
,
pDestId
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
term
);
cJSON_AddStringToObject
(
pRoot
,
"term"
,
u64buf
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
privateTerm
);
cJSON_AddStringToObject
(
pRoot
,
"privateTerm"
,
u64buf
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRId64
,
pMsg
->
commitIndex
);
cJSON_AddStringToObject
(
pRoot
,
"commitIndex"
,
u64buf
);
}
cJSON
*
pJson
=
cJSON_CreateObject
();
cJSON_AddItemToObject
(
pJson
,
"SyncHeartbeat"
,
pRoot
);
return
pJson
;
}
char
*
syncHeartbeat2Str
(
const
SyncHeartbeat
*
pMsg
)
{
cJSON
*
pJson
=
syncHeartbeat2Json
(
pMsg
);
char
*
serialized
=
cJSON_Print
(
pJson
);
cJSON_Delete
(
pJson
);
return
serialized
;
}
void
syncHeartbeatPrint
(
const
SyncHeartbeat
*
pMsg
)
{
char
*
serialized
=
syncHeartbeat2Str
(
pMsg
);
printf
(
"syncHeartbeatPrint | len:%"
PRIu64
" | %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatPrint2
(
char
*
s
,
const
SyncHeartbeat
*
pMsg
)
{
char
*
serialized
=
syncHeartbeat2Str
(
pMsg
);
printf
(
"syncHeartbeatPrint2 | len:%"
PRIu64
" | %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatLog
(
const
SyncHeartbeat
*
pMsg
)
{
char
*
serialized
=
syncHeartbeat2Str
(
pMsg
);
sTrace
(
"syncHeartbeatLog | len:%"
PRIu64
" | %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatLog2
(
char
*
s
,
const
SyncHeartbeat
*
pMsg
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
syncHeartbeat2Str
(
pMsg
);
sTrace
(
"syncHeartbeatLog2 | len:%"
PRIu64
" | %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
// ---- message process SyncHeartbeatReply----
SyncHeartbeatReply
*
syncHeartbeatReplyBuild
(
int32_t
vgId
)
{
uint32_t
bytes
=
sizeof
(
SyncHeartbeatReply
);
SyncHeartbeatReply
*
pMsg
=
taosMemoryMalloc
(
bytes
);
memset
(
pMsg
,
0
,
bytes
);
pMsg
->
bytes
=
bytes
;
pMsg
->
vgId
=
vgId
;
pMsg
->
msgType
=
TDMT_SYNC_HEARTBEAT_REPLY
;
return
pMsg
;
}
void
syncHeartbeatReplyDestroy
(
SyncHeartbeatReply
*
pMsg
)
{
if
(
pMsg
!=
NULL
)
{
taosMemoryFree
(
pMsg
);
}
}
void
syncHeartbeatReplySerialize
(
const
SyncHeartbeatReply
*
pMsg
,
char
*
buf
,
uint32_t
bufLen
)
{
ASSERT
(
pMsg
->
bytes
<=
bufLen
);
memcpy
(
buf
,
pMsg
,
pMsg
->
bytes
);
}
void
syncHeartbeatReplyDeserialize
(
const
char
*
buf
,
uint32_t
len
,
SyncHeartbeatReply
*
pMsg
)
{
memcpy
(
pMsg
,
buf
,
len
);
ASSERT
(
len
==
pMsg
->
bytes
);
}
char
*
syncHeartbeatReplySerialize2
(
const
SyncHeartbeatReply
*
pMsg
,
uint32_t
*
len
)
{
char
*
buf
=
taosMemoryMalloc
(
pMsg
->
bytes
);
ASSERT
(
buf
!=
NULL
);
syncHeartbeatReplySerialize
(
pMsg
,
buf
,
pMsg
->
bytes
);
if
(
len
!=
NULL
)
{
*
len
=
pMsg
->
bytes
;
}
return
buf
;
}
SyncHeartbeatReply
*
syncHeartbeatReplyDeserialize2
(
const
char
*
buf
,
uint32_t
len
)
{
uint32_t
bytes
=
*
((
uint32_t
*
)
buf
);
SyncHeartbeatReply
*
pMsg
=
taosMemoryMalloc
(
bytes
);
ASSERT
(
pMsg
!=
NULL
);
syncHeartbeatReplyDeserialize
(
buf
,
len
,
pMsg
);
ASSERT
(
len
==
pMsg
->
bytes
);
return
pMsg
;
}
void
syncHeartbeatReply2RpcMsg
(
const
SyncHeartbeatReply
*
pMsg
,
SRpcMsg
*
pRpcMsg
)
{
memset
(
pRpcMsg
,
0
,
sizeof
(
*
pRpcMsg
));
pRpcMsg
->
msgType
=
pMsg
->
msgType
;
pRpcMsg
->
contLen
=
pMsg
->
bytes
;
pRpcMsg
->
pCont
=
rpcMallocCont
(
pRpcMsg
->
contLen
);
syncHeartbeatReplySerialize
(
pMsg
,
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
);
}
void
syncHeartbeatReplyFromRpcMsg
(
const
SRpcMsg
*
pRpcMsg
,
SyncHeartbeatReply
*
pMsg
)
{
syncHeartbeatReplyDeserialize
(
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
,
pMsg
);
}
SyncHeartbeatReply
*
syncHeartbeatReplyFromRpcMsg2
(
const
SRpcMsg
*
pRpcMsg
)
{
SyncHeartbeatReply
*
pMsg
=
syncHeartbeatReplyDeserialize2
(
pRpcMsg
->
pCont
,
pRpcMsg
->
contLen
);
ASSERT
(
pMsg
!=
NULL
);
return
pMsg
;
}
cJSON
*
syncHeartbeatReply2Json
(
const
SyncHeartbeatReply
*
pMsg
)
{
char
u64buf
[
128
]
=
{
0
};
cJSON
*
pRoot
=
cJSON_CreateObject
();
if
(
pMsg
!=
NULL
)
{
cJSON_AddNumberToObject
(
pRoot
,
"bytes"
,
pMsg
->
bytes
);
cJSON_AddNumberToObject
(
pRoot
,
"vgId"
,
pMsg
->
vgId
);
cJSON_AddNumberToObject
(
pRoot
,
"msgType"
,
pMsg
->
msgType
);
cJSON
*
pSrcId
=
cJSON_CreateObject
();
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
srcId
.
addr
);
cJSON_AddStringToObject
(
pSrcId
,
"addr"
,
u64buf
);
{
uint64_t
u64
=
pMsg
->
srcId
.
addr
;
cJSON
*
pTmp
=
pSrcId
;
char
host
[
128
]
=
{
0
};
uint16_t
port
;
syncUtilU642Addr
(
u64
,
host
,
sizeof
(
host
),
&
port
);
cJSON_AddStringToObject
(
pTmp
,
"addr_host"
,
host
);
cJSON_AddNumberToObject
(
pTmp
,
"addr_port"
,
port
);
}
cJSON_AddNumberToObject
(
pSrcId
,
"vgId"
,
pMsg
->
srcId
.
vgId
);
cJSON_AddItemToObject
(
pRoot
,
"srcId"
,
pSrcId
);
cJSON
*
pDestId
=
cJSON_CreateObject
();
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
destId
.
addr
);
cJSON_AddStringToObject
(
pDestId
,
"addr"
,
u64buf
);
{
uint64_t
u64
=
pMsg
->
destId
.
addr
;
cJSON
*
pTmp
=
pDestId
;
char
host
[
128
]
=
{
0
};
uint16_t
port
;
syncUtilU642Addr
(
u64
,
host
,
sizeof
(
host
),
&
port
);
cJSON_AddStringToObject
(
pTmp
,
"addr_host"
,
host
);
cJSON_AddNumberToObject
(
pTmp
,
"addr_port"
,
port
);
}
cJSON_AddNumberToObject
(
pDestId
,
"vgId"
,
pMsg
->
destId
.
vgId
);
cJSON_AddItemToObject
(
pRoot
,
"destId"
,
pDestId
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
privateTerm
);
cJSON_AddStringToObject
(
pRoot
,
"privateTerm"
,
u64buf
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRIu64
,
pMsg
->
term
);
cJSON_AddStringToObject
(
pRoot
,
"term"
,
u64buf
);
cJSON_AddStringToObject
(
pRoot
,
"matchIndex"
,
u64buf
);
snprintf
(
u64buf
,
sizeof
(
u64buf
),
"%"
PRId64
,
pMsg
->
startTime
);
cJSON_AddStringToObject
(
pRoot
,
"startTime"
,
u64buf
);
}
cJSON
*
pJson
=
cJSON_CreateObject
();
cJSON_AddItemToObject
(
pJson
,
"SyncHeartbeatReply"
,
pRoot
);
return
pJson
;
}
char
*
syncHeartbeatReply2Str
(
const
SyncHeartbeatReply
*
pMsg
)
{
cJSON
*
pJson
=
syncHeartbeatReply2Json
(
pMsg
);
char
*
serialized
=
cJSON_Print
(
pJson
);
cJSON_Delete
(
pJson
);
return
serialized
;
}
void
syncHeartbeatReplyPrint
(
const
SyncHeartbeatReply
*
pMsg
)
{
char
*
serialized
=
syncHeartbeatReply2Str
(
pMsg
);
printf
(
"syncHeartbeatReplyPrint | len:%"
PRIu64
" | %s
\n
"
,
strlen
(
serialized
),
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatReplyPrint2
(
char
*
s
,
const
SyncHeartbeatReply
*
pMsg
)
{
char
*
serialized
=
syncHeartbeatReply2Str
(
pMsg
);
printf
(
"syncHeartbeatReplyPrint2 | len:%"
PRIu64
" | %s | %s
\n
"
,
strlen
(
serialized
),
s
,
serialized
);
fflush
(
NULL
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatReplyLog
(
const
SyncHeartbeatReply
*
pMsg
)
{
char
*
serialized
=
syncHeartbeatReply2Str
(
pMsg
);
sTrace
(
"syncHeartbeatReplyLog | len:%"
PRIu64
" | %s"
,
strlen
(
serialized
),
serialized
);
taosMemoryFree
(
serialized
);
}
void
syncHeartbeatReplyLog2
(
char
*
s
,
const
SyncHeartbeatReply
*
pMsg
)
{
if
(
gRaftDetailLog
)
{
char
*
serialized
=
syncHeartbeatReply2Str
(
pMsg
);
sTrace
(
"syncHeartbeatReplyLog2 | len:%"
PRIu64
" | %s | %s"
,
strlen
(
serialized
),
s
,
serialized
);
taosMemoryFree
(
serialized
);
}
}
// ---- message process SyncApplyMsg----
SyncApplyMsg
*
syncApplyMsgBuild
(
uint32_t
dataLen
)
{
uint32_t
bytes
=
sizeof
(
SyncApplyMsg
)
+
dataLen
;
...
...
source/libs/sync/test/CMakeLists.txt
浏览文件 @
edef93be
...
...
@@ -57,6 +57,8 @@ add_executable(syncLeaderTransferTest "")
add_executable
(
syncReconfigFinishTest
""
)
add_executable
(
syncRestoreFromSnapshot
""
)
add_executable
(
syncRaftCfgIndexTest
""
)
add_executable
(
syncHeartbeatTest
""
)
add_executable
(
syncHeartbeatReplyTest
""
)
target_sources
(
syncTest
...
...
@@ -295,6 +297,14 @@ target_sources(syncRaftCfgIndexTest
PRIVATE
"syncRaftCfgIndexTest.cpp"
)
target_sources
(
syncHeartbeatTest
PRIVATE
"syncHeartbeatTest.cpp"
)
target_sources
(
syncHeartbeatReplyTest
PRIVATE
"syncHeartbeatReplyTest.cpp"
)
target_include_directories
(
syncTest
...
...
@@ -592,6 +602,16 @@ target_include_directories(syncRaftCfgIndexTest
"
${
TD_SOURCE_DIR
}
/include/libs/sync"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../inc"
)
target_include_directories
(
syncHeartbeatTest
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/sync"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../inc"
)
target_include_directories
(
syncHeartbeatReplyTest
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/sync"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../inc"
)
target_link_libraries
(
syncTest
...
...
@@ -830,6 +850,14 @@ target_link_libraries(syncRaftCfgIndexTest
sync
gtest_main
)
target_link_libraries
(
syncHeartbeatTest
sync
gtest_main
)
target_link_libraries
(
syncHeartbeatReplyTest
sync
gtest_main
)
enable_testing
()
...
...
source/libs/sync/test/syncHeartbeatReplyTest.cpp
0 → 100644
浏览文件 @
edef93be
#include <gtest/gtest.h>
#include <stdio.h>
#include "syncIO.h"
#include "syncInt.h"
#include "syncMessage.h"
#include "syncUtil.h"
void
logTest
()
{
sTrace
(
"--- sync log test: trace"
);
sDebug
(
"--- sync log test: debug"
);
sInfo
(
"--- sync log test: info"
);
sWarn
(
"--- sync log test: warn"
);
sError
(
"--- sync log test: error"
);
sFatal
(
"--- sync log test: fatal"
);
}
SyncHeartbeatReply
*
createMsg
()
{
SyncHeartbeatReply
*
pMsg
=
syncHeartbeatReplyBuild
(
1000
);
pMsg
->
srcId
.
addr
=
syncUtilAddr2U64
(
"127.0.0.1"
,
1234
);
pMsg
->
srcId
.
vgId
=
100
;
pMsg
->
destId
.
addr
=
syncUtilAddr2U64
(
"127.0.0.1"
,
5678
);
pMsg
->
destId
.
vgId
=
100
;
pMsg
->
term
=
33
;
pMsg
->
privateTerm
=
44
;
pMsg
->
startTime
=
taosGetTimestampMs
();
return
pMsg
;
}
void
test1
()
{
SyncHeartbeatReply
*
pMsg
=
createMsg
();
syncHeartbeatReplyLog2
((
char
*
)
"test1:"
,
pMsg
);
syncHeartbeatReplyDestroy
(
pMsg
);
}
void
test2
()
{
SyncHeartbeatReply
*
pMsg
=
createMsg
();
uint32_t
len
=
pMsg
->
bytes
;
char
*
serialized
=
(
char
*
)
taosMemoryMalloc
(
len
);
syncHeartbeatReplySerialize
(
pMsg
,
serialized
,
len
);
SyncHeartbeatReply
*
pMsg2
=
syncHeartbeatReplyBuild
(
1000
);
syncHeartbeatReplyDeserialize
(
serialized
,
len
,
pMsg2
);
syncHeartbeatReplyLog2
((
char
*
)
"test2: syncHeartbeatReplySerialize -> syncHeartbeatReplyDeserialize "
,
pMsg2
);
taosMemoryFree
(
serialized
);
syncHeartbeatReplyDestroy
(
pMsg
);
syncHeartbeatReplyDestroy
(
pMsg2
);
}
void
test3
()
{
SyncHeartbeatReply
*
pMsg
=
createMsg
();
uint32_t
len
;
char
*
serialized
=
syncHeartbeatReplySerialize2
(
pMsg
,
&
len
);
SyncHeartbeatReply
*
pMsg2
=
syncHeartbeatReplyDeserialize2
(
serialized
,
len
);
syncHeartbeatReplyLog2
((
char
*
)
"test3: syncHeartbeatReplySerialize3 -> syncHeartbeatReplyDeserialize2 "
,
pMsg2
);
taosMemoryFree
(
serialized
);
syncHeartbeatReplyDestroy
(
pMsg
);
syncHeartbeatReplyDestroy
(
pMsg2
);
}
void
test4
()
{
SyncHeartbeatReply
*
pMsg
=
createMsg
();
SRpcMsg
rpcMsg
;
syncHeartbeatReply2RpcMsg
(
pMsg
,
&
rpcMsg
);
SyncHeartbeatReply
*
pMsg2
=
syncHeartbeatReplyBuild
(
1000
);
syncHeartbeatReplyFromRpcMsg
(
&
rpcMsg
,
pMsg2
);
syncHeartbeatReplyLog2
((
char
*
)
"test4: syncHeartbeatReply2RpcMsg -> syncHeartbeatReplyFromRpcMsg "
,
pMsg2
);
rpcFreeCont
(
rpcMsg
.
pCont
);
syncHeartbeatReplyDestroy
(
pMsg
);
syncHeartbeatReplyDestroy
(
pMsg2
);
}
void
test5
()
{
SyncHeartbeatReply
*
pMsg
=
createMsg
();
SRpcMsg
rpcMsg
;
syncHeartbeatReply2RpcMsg
(
pMsg
,
&
rpcMsg
);
SyncHeartbeatReply
*
pMsg2
=
syncHeartbeatReplyFromRpcMsg2
(
&
rpcMsg
);
syncHeartbeatReplyLog2
((
char
*
)
"test5: syncHeartbeatReply2RpcMsg -> syncHeartbeatReplyFromRpcMsg2 "
,
pMsg2
);
rpcFreeCont
(
rpcMsg
.
pCont
);
syncHeartbeatReplyDestroy
(
pMsg
);
syncHeartbeatReplyDestroy
(
pMsg2
);
}
int
main
()
{
gRaftDetailLog
=
true
;
tsAsyncLog
=
0
;
sDebugFlag
=
DEBUG_TRACE
+
DEBUG_SCREEN
+
DEBUG_FILE
;
logTest
();
test1
();
test2
();
test3
();
test4
();
test5
();
return
0
;
}
source/libs/sync/test/syncHeartbeatTest.cpp
0 → 100644
浏览文件 @
edef93be
#include <gtest/gtest.h>
#include <stdio.h>
#include "syncIO.h"
#include "syncInt.h"
#include "syncMessage.h"
#include "syncUtil.h"
void
logTest
()
{
sTrace
(
"--- sync log test: trace"
);
sDebug
(
"--- sync log test: debug"
);
sInfo
(
"--- sync log test: info"
);
sWarn
(
"--- sync log test: warn"
);
sError
(
"--- sync log test: error"
);
sFatal
(
"--- sync log test: fatal"
);
}
SyncHeartbeat
*
createMsg
()
{
SyncHeartbeat
*
pMsg
=
syncHeartbeatBuild
(
789
);
pMsg
->
srcId
.
addr
=
syncUtilAddr2U64
(
"127.0.0.1"
,
1234
);
pMsg
->
srcId
.
vgId
=
100
;
pMsg
->
destId
.
addr
=
syncUtilAddr2U64
(
"127.0.0.1"
,
5678
);
pMsg
->
destId
.
vgId
=
100
;
pMsg
->
term
=
8
;
pMsg
->
commitIndex
=
33
;
pMsg
->
privateTerm
=
44
;
return
pMsg
;
}
void
test1
()
{
SyncHeartbeat
*
pMsg
=
createMsg
();
syncHeartbeatLog2
((
char
*
)
"test1:"
,
pMsg
);
syncHeartbeatDestroy
(
pMsg
);
}
void
test2
()
{
SyncHeartbeat
*
pMsg
=
createMsg
();
uint32_t
len
=
pMsg
->
bytes
;
char
*
serialized
=
(
char
*
)
taosMemoryMalloc
(
len
);
syncHeartbeatSerialize
(
pMsg
,
serialized
,
len
);
SyncHeartbeat
*
pMsg2
=
syncHeartbeatBuild
(
789
);
syncHeartbeatDeserialize
(
serialized
,
len
,
pMsg2
);
syncHeartbeatLog2
((
char
*
)
"test2: syncHeartbeatSerialize -> syncHeartbeatDeserialize "
,
pMsg2
);
taosMemoryFree
(
serialized
);
syncHeartbeatDestroy
(
pMsg
);
syncHeartbeatDestroy
(
pMsg2
);
}
void
test3
()
{
SyncHeartbeat
*
pMsg
=
createMsg
();
uint32_t
len
;
char
*
serialized
=
syncHeartbeatSerialize2
(
pMsg
,
&
len
);
SyncHeartbeat
*
pMsg2
=
syncHeartbeatDeserialize2
(
serialized
,
len
);
syncHeartbeatLog2
((
char
*
)
"test3: syncHeartbeatSerialize2 -> syncHeartbeatDeserialize2 "
,
pMsg2
);
taosMemoryFree
(
serialized
);
syncHeartbeatDestroy
(
pMsg
);
syncHeartbeatDestroy
(
pMsg2
);
}
void
test4
()
{
SyncHeartbeat
*
pMsg
=
createMsg
();
SRpcMsg
rpcMsg
;
syncHeartbeat2RpcMsg
(
pMsg
,
&
rpcMsg
);
SyncHeartbeat
*
pMsg2
=
(
SyncHeartbeat
*
)
taosMemoryMalloc
(
rpcMsg
.
contLen
);
syncHeartbeatFromRpcMsg
(
&
rpcMsg
,
pMsg2
);
syncHeartbeatLog2
((
char
*
)
"test4: syncHeartbeat2RpcMsg -> syncHeartbeatFromRpcMsg "
,
pMsg2
);
rpcFreeCont
(
rpcMsg
.
pCont
);
syncHeartbeatDestroy
(
pMsg
);
syncHeartbeatDestroy
(
pMsg2
);
}
void
test5
()
{
SyncHeartbeat
*
pMsg
=
createMsg
();
SRpcMsg
rpcMsg
;
syncHeartbeat2RpcMsg
(
pMsg
,
&
rpcMsg
);
SyncHeartbeat
*
pMsg2
=
syncHeartbeatFromRpcMsg2
(
&
rpcMsg
);
syncHeartbeatLog2
((
char
*
)
"test5: syncHeartbeat2RpcMsg -> syncHeartbeatFromRpcMsg2 "
,
pMsg2
);
rpcFreeCont
(
rpcMsg
.
pCont
);
syncHeartbeatDestroy
(
pMsg
);
syncHeartbeatDestroy
(
pMsg2
);
}
int
main
()
{
tsAsyncLog
=
0
;
sDebugFlag
=
DEBUG_TRACE
+
DEBUG_SCREEN
+
DEBUG_FILE
;
gRaftDetailLog
=
true
;
logTest
();
test1
();
test2
();
test3
();
test4
();
test5
();
return
0
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录