Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
23751361
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
23751361
编写于
1月 18, 2021
作者:
H
Hui Li
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into hotfix/test
上级
89faa1df
989401b8
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
362 addition
and
0 deletion
+362
-0
tests/perftest-scripts/perftest-taosdemo.sh
tests/perftest-scripts/perftest-taosdemo.sh
+3
-0
tests/perftest-scripts/perftest-tsdb-compare-13d.sh
tests/perftest-scripts/perftest-tsdb-compare-13d.sh
+3
-0
tests/perftest-scripts/perftest-tsdb-compare-1d.sh
tests/perftest-scripts/perftest-tsdb-compare-1d.sh
+3
-0
tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
.../perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
+3
-0
tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
...s/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
+3
-0
tests/pytest/cluster/clusterEnvSetup/Dockerfile
tests/pytest/cluster/clusterEnvSetup/Dockerfile
+36
-0
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
+102
-0
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
+127
-0
tests/pytest/cluster/clusterEnvSetup/node4.yml
tests/pytest/cluster/clusterEnvSetup/node4.yml
+41
-0
tests/pytest/cluster/clusterEnvSetup/node5.yml
tests/pytest/cluster/clusterEnvSetup/node5.yml
+41
-0
未找到文件。
tests/perftest-scripts/perftest-taosdemo.sh
浏览文件 @
23751361
...
@@ -16,6 +16,9 @@ fi
...
@@ -16,6 +16,9 @@ fi
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
[
-z
"
$logDir
"
]
&&
logDir
=
"/var/log/taos"
[
-z
"
$dataDir
"
]
&&
dataDir
=
"/var/lib/taos"
# Coloured Echoes
# Coloured Echoes
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
...
...
tests/perftest-scripts/perftest-tsdb-compare-13d.sh
浏览文件 @
23751361
...
@@ -16,6 +16,9 @@ fi
...
@@ -16,6 +16,9 @@ fi
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
[
-z
"
$logDir
"
]
&&
logDir
=
"/var/log/taos"
[
-z
"
$dataDir
"
]
&&
dataDir
=
"/var/lib/taos"
# Coloured Echoes #
# Coloured Echoes #
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
...
...
tests/perftest-scripts/perftest-tsdb-compare-1d.sh
浏览文件 @
23751361
...
@@ -16,6 +16,9 @@ fi
...
@@ -16,6 +16,9 @@ fi
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
[
-z
"
$logDir
"
]
&&
logDir
=
"/var/log/taos"
[
-z
"
$dataDir
"
]
&&
dataDir
=
"/var/lib/taos"
# Coloured Echoes #
# Coloured Echoes #
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
...
...
tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
浏览文件 @
23751361
...
@@ -16,6 +16,9 @@ fi
...
@@ -16,6 +16,9 @@ fi
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
[
-z
"
$logDir
"
]
&&
logDir
=
"/var/log/taos"
[
-z
"
$dataDir
"
]
&&
dataDir
=
"/var/lib/taos"
# Coloured Echoes #
# Coloured Echoes #
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
...
...
tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
浏览文件 @
23751361
...
@@ -16,6 +16,9 @@ fi
...
@@ -16,6 +16,9 @@ fi
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
logDir
=
`
grep
"^logDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
dataDir
=
`
grep
"^dataDir"
/etc/taos/taos.cfg |
awk
'{print $2}'
`
[
-z
"
$logDir
"
]
&&
logDir
=
"/var/log/taos"
[
-z
"
$dataDir
"
]
&&
dataDir
=
"/var/lib/taos"
# Coloured Echoes #
# Coloured Echoes #
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
red_echo
{
echo
-e
"
\0
33[31m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
function
green_echo
{
echo
-e
"
\0
33[32m
$@
\0
33[0m"
;
}
#
...
...
tests/pytest/cluster/clusterEnvSetup/Dockerfile
0 → 100644
浏览文件 @
23751361
FROM
ubuntu:latest AS builder
ARG
PACKAGE=TDengine-server-1.6.5.10-Linux-x64.tar.gz
ARG
EXTRACTDIR=TDengine-enterprise-server
ARG
CONTENT=taos.tar.gz
WORKDIR
/root
COPY
${PACKAGE} .
RUN
tar
-zxf
${
PACKAGE
}
RUN
mv
${
EXTRACTDIR
}
/driver ./lib
RUN
tar
-zxf
${
EXTRACTDIR
}
/
${
CONTENT
}
FROM
ubuntu:latest
WORKDIR
/root
RUN
apt-get update
RUN
apt-get
install
-y
vim tmux net-tools
RUN
echo
'alias ll="ls -l --color=auto"'
>>
/root/.bashrc
COPY
--from=builder /root/bin/taosd /usr/bin
COPY
--from=builder /root/bin/taos /usr/bin
COPY
--from=builder /root/cfg/taos.cfg /etc/taos/
COPY
--from=builder /root/lib/libtaos.so.* /usr/lib/libtaos.so.1
ENV
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
ENV
LC_CTYPE=en_US.UTF-8
ENV
LANG=en_US.UTF-8
EXPOSE
6030-6041/tcp 6060/tcp 6030-6039/udp
# VOLUME [ "/var/lib/taos", "/var/log/taos", "/etc/taos" ]
CMD
[ "bash" ]
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
0 → 100755
浏览文件 @
23751361
#!/bin/bash
echo
"Executing buildClusterEnv.sh"
DOCKER_DIR
=
/data
CURR_DIR
=
`
pwd
`
if
[
$#
!=
4
]
;
then
echo
"argument list need input : "
echo
" -n numOfNodes"
echo
" -v version"
exit
1
fi
NUM_OF_NODES
=
VERSION
=
while
getopts
"n:v:"
arg
do
case
$arg
in
n
)
NUM_OF_NODES
=
$OPTARG
;;
v
)
VERSION
=
$OPTARG
;;
?
)
echo
"unkonwn argument"
;;
esac
done
function
createDIR
{
for
i
in
{
1..
$2
}
do
mkdir
-p
/data/node
$i
/data
mkdir
-p
/data/node
$i
/log
mkdir
-p
/data/node
$i
/cfg
done
}
function
cleanEnv
{
for
i
in
{
1..3
}
do
echo
/data/node
$i
/data/
*
rm
-rf
/data/node
$i
/data/
*
echo
/data/node
$i
/log/
*
rm
-rf
/data/node
$i
/log/
*
done
}
function
prepareBuild
{
if
[
-d
$CURR_DIR
/../../../../release
]
;
then
echo
release exists
rm
-rf
$CURR_DIR
/../../../../release/
*
fi
cd
$CURR_DIR
/../../../../packaging
./release.sh
-v
edge
-n
$VERSION
>>
/dev/null
if
[
!
-f
$CURR_DIR
/../../../../release/TDengine-server-
$VERSION
-Linux-x64
.tar.gz
]
;
then
echo
"no TDengine install package found"
exit
1
fi
cd
$CURR_DIR
/../../../../release
mv
TDengine-server-
$VERSION
-Linux-x64
.tar.gz
$DOCKER_DIR
rm
-rf
$DOCKER_DIR
/
*
.yml
cd
$CURR_DIR
cp
docker-compose.yml
$DOCKER_DIR
cp
Dockerfile
$DOCKER_DIR
if
[
$NUM_OF_NODES
-eq
4
]
;
then
cp
../node4.yml
$DOCKER_DIR
fi
if
[
$NUM_OF_NODES
-eq
5
]
;
then
cp
../node5.yml
$DOCKER_DIR
fi
}
function
clusterUp
{
cd
$DOCKER_DIR
if
[
$NUM_OF_NODES
-eq
3
]
;
then
PACKAGE
=
TDengine-server-
$VERSION
-Linux-x64
.tar.gz
DIR
=
TDengine-server-
$VERSION
docker-compose up
-d
fi
if
[
$NUM_OF_NODES
-eq
4
]
;
then
PACKAGE
=
TDengine-server-
$VERSION
-Linux-x64
.tar.gz
DIR
=
TDengine-server-
$VERSION
docker-compose
-f
docker-compose.yml
-f
node4.yml up
-d
fi
if
[
$NUM_OF_NODES
-eq
5
]
;
then
PACKAGE
=
TDengine-server-
$VERSION
-Linux-x64
.tar.gz
DIR
=
TDengine-server-
$VERSION
docker-compose
-f
docker-compose.yml
-f
node4.yml
-f
node5.yml up
-d
fi
}
cleanEnv
# prepareBuild
# clusterUp
\ No newline at end of file
tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
0 → 100644
浏览文件 @
23751361
version
:
'
3.7'
services
:
td2.0-node1
:
build
:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
EXTRACTDIR=${DIR}
image
:
'
tdengine:2.0.13.1'
container_name
:
'
td2.0-node1'
cap_add
:
-
ALL
stdin_open
:
true
tty
:
true
environment
:
TZ
:
"
Asia/Shanghai"
command
:
>
sh -c "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime &&
echo $TZ > /etc/timezone &&
exec my-main-application"
volumes
:
# bind data directory
-
type
:
bind
source
:
/data/node1/data
target
:
/var/lib/taos
# bind log directory
-
type
:
bind
source
:
/data/node1/log
target
:
/var/log/taos
# bind configuration
-
type
:
bind
source
:
/data/node1/cfg
target
:
/etc/taos
-
type
:
bind
source
:
/data
target
:
/root
networks
:
taos_update_net
:
ipv4_address
:
172.27.0.7
command
:
taosd
td2.0-node2
:
build
:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
EXTRACTDIR=${DIR}
image
:
'
tdengine:2.0.13.1'
container_name
:
'
td2.0-node2'
cap_add
:
-
ALL
stdin_open
:
true
tty
:
true
environment
:
TZ
:
"
Asia/Shanghai"
command
:
>
sh -c "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime &&
echo $TZ > /etc/timezone &&
exec my-main-application"
volumes
:
# bind data directory
-
type
:
bind
source
:
/data/node2/data
target
:
/var/lib/taos
# bind log directory
-
type
:
bind
source
:
/data/node2/log
target
:
/var/log/taos
# bind configuration
-
type
:
bind
source
:
/data/node2/cfg
target
:
/etc/taos
-
type
:
bind
source
:
/data
target
:
/root
networks
:
taos_update_net
:
ipv4_address
:
172.27.0.8
command
:
taosd
td2.0-node3
:
build
:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
EXTRACTDIR=${DIR}
image
:
'
tdengine:2.0.13.1'
container_name
:
'
td2.0-node3'
cap_add
:
-
ALL
stdin_open
:
true
tty
:
true
environment
:
TZ
:
"
Asia/Shanghai"
command
:
>
sh -c "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime &&
echo $TZ > /etc/timezone &&
exec my-main-application"
volumes
:
# bind data directory
-
type
:
bind
source
:
/data/node3/data
target
:
/var/lib/taos
# bind log directory
-
type
:
bind
source
:
/data/node3/log
target
:
/var/log/taos
# bind configuration
-
type
:
bind
source
:
/data/node3/cfg
target
:
/etc/taos
-
type
:
bind
source
:
/data
target
:
/root
networks
:
taos_update_net
:
ipv4_address
:
172.27.0.9
command
:
taosd
networks
:
taos_update_net
:
# external: true
ipam
:
driver
:
default
config
:
-
subnet
:
"
172.27.0.0/24"
tests/pytest/cluster/clusterEnvSetup/node4.yml
0 → 100644
浏览文件 @
23751361
version
:
'
3.7'
services
:
td2.0-node4
:
build
:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
EXTRACTDIR=${DIR}
image
:
'
tdengine:2.0.13.1'
container_name
:
'
td2.0-node4'
cap_add
:
-
ALL
stdin_open
:
true
tty
:
true
environment
:
TZ
:
"
Asia/Shanghai"
command
:
>
sh -c "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime &&
echo $TZ > /etc/timezone &&
exec my-main-application"
volumes
:
# bind data directory
-
type
:
bind
source
:
/data/node4/data
target
:
/var/lib/taos
# bind log directory
-
type
:
bind
source
:
/data/node4/log
target
:
/var/log/taos
# bind configuration
-
type
:
bind
source
:
/data/node4/cfg
target
:
/etc/taos
-
type
:
bind
source
:
/data
target
:
/root
networks
:
taos_update_net
:
ipv4_address
:
172.27.0.10
command
:
taosd
\ No newline at end of file
tests/pytest/cluster/clusterEnvSetup/node5.yml
0 → 100644
浏览文件 @
23751361
version
:
'
3.7'
services
:
td2.0-node5
:
build
:
context
:
.
args
:
-
PACKAGE=${PACKAGE}
-
EXTRACTDIR=${DIR}
image
:
'
tdengine:2.0.13.1'
container_name
:
'
td2.0-node5'
cap_add
:
-
ALL
stdin_open
:
true
tty
:
true
environment
:
TZ
:
"
Asia/Shanghai"
command
:
>
sh -c "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime &&
echo $TZ > /etc/timezone &&
exec my-main-application"
volumes
:
# bind data directory
-
type
:
bind
source
:
/data/node5/data
target
:
/var/lib/taos
# bind log directory
-
type
:
bind
source
:
/data/node5/log
target
:
/var/log/taos
# bind configuration
-
type
:
bind
source
:
/data/node5/cfg
target
:
/etc/taos
-
type
:
bind
source
:
/data
target
:
/root
networks
:
taos_update_net
:
ipv4_address
:
172.27.0.11
command
:
taosd
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录