Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
410e15c5
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看板
提交
410e15c5
编写于
7月 01, 2022
作者:
haoranc
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: modify testcases of muti-mnodes
上级
8a9a2759
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
158 addition
and
71 deletion
+158
-71
tests/system-test/1-insert/insertWithMoreVgroup.py
tests/system-test/1-insert/insertWithMoreVgroup.py
+0
-34
tests/system-test/2-query/queryQnode.py
tests/system-test/2-query/queryQnode.py
+153
-8
tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
...-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
+2
-26
tests/system-test/6-cluster/clusterCommonCheck.py
tests/system-test/6-cluster/clusterCommonCheck.py
+2
-1
tests/system-test/6-cluster/clusterCommonCreate.py
tests/system-test/6-cluster/clusterCommonCreate.py
+0
-1
tests/system-test/fulltest.sh
tests/system-test/fulltest.sh
+1
-1
未找到文件。
tests/system-test/1-insert/insertWithMoreVgroup.py
浏览文件 @
410e15c5
...
...
@@ -355,40 +355,6 @@ class TDTestCase:
return
def
test_case4
(
self
):
self
.
taosBenchCreate
(
"127.0.0.1"
,
"no"
,
"db1"
,
"stb1"
,
1
,
2
,
1
*
10
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
query
(
"show dnodes;"
)
dnodeId
=
tdSql
.
getData
(
0
,
0
)
print
(
dnodeId
)
tdSql
.
execute
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
maxQnode
=
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
minQnode
=
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
unionQnode
=
tdSql
.
queryResult
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
unionallQnode
=
tdSql
.
queryResult
# tdSql.query("show qnodes;")
# qnodeId=tdSql.getData(0,0)
tdSql
.
execute
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
tdSql
.
checkData
(
0
,
0
,
"%s"
%
maxQnode
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
tdSql
.
checkData
(
0
,
0
,
"%s"
%
minQnode
)
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
unionVnode
=
tdSql
.
queryResult
assert
unionQnode
==
unionVnode
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
unionallVnode
=
tdSql
.
queryResult
assert
unionallQnode
==
unionallVnode
# tdSql.execute("create qnode on dnode %s"%dnodeId)
# run case
def
run
(
self
):
...
...
tests/system-test/2-query/queryQnode.py
浏览文件 @
410e15c5
...
...
@@ -17,6 +17,8 @@ import threading as thd
import
multiprocessing
as
mp
from
numpy.lib.function_base
import
insert
import
taos
from
util.dnodes
import
TDDnode
from
util.dnodes
import
*
from
util.log
import
*
from
util.cases
import
*
from
util.sql
import
*
...
...
@@ -30,9 +32,9 @@ class TDTestCase:
#
# --------------- main frame -------------------
#
clientCfgDict
=
{
'query
prox
y'
:
'1'
,
'debugFlag'
:
135
}
clientCfgDict
[
"query
proxy"
]
=
'2
'
clientCfgDict
[
"debugFlag"
]
=
1
43
clientCfgDict
=
{
'query
Polic
y'
:
'1'
,
'debugFlag'
:
135
}
clientCfgDict
[
"query
Policy"
]
=
'1
'
clientCfgDict
[
"debugFlag"
]
=
1
31
updatecfgDict
=
{
'clientCfg'
:
{}}
updatecfgDict
=
{
'debugFlag'
:
143
}
...
...
@@ -62,7 +64,7 @@ class TDTestCase:
return
buildPath
# init
def
init
(
self
,
conn
,
logSql
):
def
init
(
self
,
conn
,
logSql
=
True
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
())
# tdSql.prepare()
...
...
@@ -292,12 +294,13 @@ class TDTestCase:
tdLog
.
debug
(
"-----create database and muti-thread create tables test------- "
)
def
test_case
4
(
self
):
def
test_case
1
(
self
):
self
.
taosBenchCreate
(
"127.0.0.1"
,
"no"
,
"db1"
,
"stb1"
,
1
,
2
,
1
*
10
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
query
(
"show dnodes;"
)
dnodeId
=
tdSql
.
getData
(
0
,
0
)
print
(
dnodeId
)
tdLog
.
debug
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
maxQnode
=
tdSql
.
getData
(
0
,
0
)
...
...
@@ -310,6 +313,7 @@ class TDTestCase:
# tdSql.query("show qnodes;")
# qnodeId=tdSql.getData(0,0)
tdLog
.
debug
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
...
...
@@ -323,15 +327,156 @@ class TDTestCase:
unionallVnode
=
tdSql
.
queryResult
assert
unionallQnode
==
unionallVnode
queryPolicy
=
2
simClientCfg
=
"%s/taos.cfg"
%
tdDnodes
.
getSimCfgPath
()
cmd
=
'sed -i "s/^queryPolicy.*/queryPolicy 2/g" %s'
%
simClientCfg
os
.
system
(
cmd
)
# tdDnodes.stop(1)
# tdDnodes.start(1)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
execute
(
'alter local "queryPolicy" "%d"'
%
queryPolicy
)
tdSql
.
query
(
"show local variables;"
)
for
i
in
range
(
tdSql
.
queryRows
):
if
tdSql
.
queryResult
[
i
][
0
]
==
"queryPolicy"
:
if
int
(
tdSql
.
queryResult
[
i
][
1
])
==
int
(
queryPolicy
):
tdLog
.
success
(
'alter queryPolicy to %d successfully'
%
queryPolicy
)
else
:
tdLog
.
debug
(
tdSql
.
queryResult
)
tdLog
.
exit
(
"alter queryPolicy to %d failed"
%
queryPolicy
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
query
(
"show dnodes;"
)
dnodeId
=
tdSql
.
getData
(
0
,
0
)
tdLog
.
debug
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
assert
maxQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
assert
minQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
assert
unionQnode
==
tdSql
.
queryResult
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
assert
unionallQnode
==
tdSql
.
queryResult
# tdSql.query("show qnodes;")
# qnodeId=tdSql.getData(0,0)
tdLog
.
debug
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
assert
maxQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
assert
minQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
# tdSql.execute("create qnode on dnode %s"%dnodeId)
queryPolicy
=
3
simClientCfg
=
"%s/taos.cfg"
%
tdDnodes
.
getSimCfgPath
()
cmd
=
'sed -i "s/^queryPolicy.*/queryPolicy 2/g" %s'
%
simClientCfg
os
.
system
(
cmd
)
# tdDnodes.stop(1)
# tdDnodes.start(1)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
execute
(
'alter local "queryPolicy" "%d"'
%
queryPolicy
)
tdSql
.
query
(
"show local variables;"
)
for
i
in
range
(
tdSql
.
queryRows
):
if
tdSql
.
queryResult
[
i
][
0
]
==
"queryPolicy"
:
if
int
(
tdSql
.
queryResult
[
i
][
1
])
==
int
(
queryPolicy
):
tdLog
.
success
(
'alter queryPolicy to %d successfully'
%
queryPolicy
)
else
:
tdLog
.
debug
(
tdSql
.
queryResult
)
tdLog
.
exit
(
"alter queryPolicy to %d failed"
%
queryPolicy
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
query
(
"show dnodes;"
)
dnodeId
=
tdSql
.
getData
(
0
,
0
)
tdLog
.
debug
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"create qnode on dnode %s"
%
dnodeId
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
assert
maxQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
assert
minQnode
==
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
assert
unionQnode
==
tdSql
.
queryResult
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
assert
unionallQnode
==
tdSql
.
queryResult
def
test_case2
(
self
):
self
.
taosBenchCreate
(
"127.0.0.1"
,
"no"
,
"db1"
,
"stb1"
,
10
,
2
,
1
*
10
)
tdSql
.
query
(
"show qnodes"
)
if
tdSql
.
queryRows
==
1
:
tdLog
.
debug
(
"drop qnode on dnode 1"
)
tdSql
.
execute
(
"drop qnode on dnode 1"
)
queryPolicy
=
2
simClientCfg
=
"%s/taos.cfg"
%
tdDnodes
.
getSimCfgPath
()
cmd
=
'sed -i "s/^queryPolicy.*/queryPolicy 2/g" %s'
%
simClientCfg
os
.
system
(
cmd
)
# tdDnodes.stop(1)
# tdDnodes.start(1)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
execute
(
'alter local "queryPolicy" "%d"'
%
queryPolicy
)
tdSql
.
query
(
"show local variables;"
)
for
i
in
range
(
tdSql
.
queryRows
):
if
tdSql
.
queryResult
[
i
][
0
]
==
"queryPolicy"
:
if
int
(
tdSql
.
queryResult
[
i
][
1
])
==
int
(
queryPolicy
):
tdLog
.
success
(
'alter queryPolicy to %d successfully'
%
queryPolicy
)
else
:
tdLog
.
debug
(
tdSql
.
queryResult
)
tdLog
.
exit
(
"alter queryPolicy to %d failed"
%
queryPolicy
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
error
(
"select max(c1) from stb10;"
)
tdSql
.
error
(
"select min(c1) from stb11;"
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
tdSql
.
query
(
"select max(c1) from stb10_0;"
)
tdSql
.
query
(
"select min(c1) from stb11_0;"
)
def
test_case3
(
self
):
tdSql
.
execute
(
'alter local "queryPolicy" "3"'
)
tdLog
.
debug
(
"create qnode on dnode 1"
)
tdSql
.
execute
(
"create qnode on dnode 1"
)
tdSql
.
execute
(
"use db1;"
)
tdSql
.
query
(
"show dnodes;"
)
dnodeId
=
tdSql
.
getData
(
0
,
0
)
print
(
dnodeId
)
tdSql
.
query
(
"select max(c1) from stb10;"
)
maxQnode
=
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select min(c1) from stb11;"
)
minQnode
=
tdSql
.
getData
(
0
,
0
)
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
unionQnode
=
tdSql
.
queryResult
tdSql
.
query
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
unionallQnode
=
tdSql
.
queryResult
# tdSql.query("show qnodes;")
# qnodeId=tdSql.getData(0,0)
tdLog
.
debug
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"drop qnode on dnode %s"
%
dnodeId
)
tdSql
.
execute
(
"reset query cache"
)
tdSql
.
error
(
"select max(c1) from stb10;"
)
tdSql
.
error
(
"select min(c1) from stb11;"
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union select c0,c1 from stb11_1 where c0>2000;"
)
tdSql
.
error
(
"select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;"
)
# run case
def
run
(
self
):
# test qnode
self
.
test_case4
()
tdLog
.
debug
(
" LIMIT test_case3 ............ [OK]"
)
self
.
test_case1
()
self
.
test_case2
()
self
.
test_case3
()
# tdLog.debug(" LIMIT test_case3 ............ [OK]")
return
...
...
tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
浏览文件 @
410e15c5
...
...
@@ -65,31 +65,6 @@ class TDTestCase:
self
.
_async_raise
(
thread
.
ident
,
SystemExit
)
def
insertData
(
self
,
countstart
,
countstop
):
# fisrt add data : db\stable\childtable\general table
for
couti
in
range
(
countstart
,
countstop
):
tdLog
.
debug
(
"drop database if exists db%d"
%
couti
)
tdSql
.
execute
(
"drop database if exists db%d"
%
couti
)
print
(
"create database if not exists db%d replica 1 duration 300"
%
couti
)
tdSql
.
execute
(
"create database if not exists db%d replica 1 duration 300"
%
couti
)
tdSql
.
execute
(
"use db%d"
%
couti
)
tdSql
.
execute
(
'''create table stb1
(ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
tags (t1 int)
'''
)
tdSql
.
execute
(
'''
create table t1
(ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
'''
)
for
i
in
range
(
4
):
tdSql
.
execute
(
f
'create table ct
{
i
+
1
}
using stb1 tags (
{
i
+
1
}
)'
)
def
fiveDnodeThreeMnode
(
self
,
dnodeNumbers
,
mnodeNums
,
restartNumbers
,
stopRole
):
tdLog
.
printNoPrefix
(
"======== test case 1: "
)
paraDict
=
{
'dbName'
:
'db'
,
...
...
@@ -143,7 +118,8 @@ class TDTestCase:
threads
=
[]
for
i
in
range
(
restartNumbers
):
dbNameIndex
=
'%s%d'
%
(
paraDict
[
"dbName"
],
i
)
threads
.
append
(
threading
.
Thread
(
target
=
clusterComCreate
.
create_databases
,
args
=
(
tdSql
,
dbNameIndex
,
paraDict
[
"dbNumbers"
],
paraDict
[
"dropFlag"
],
paraDict
[
"vgroups"
],
paraDict
[
'replica'
])))
newTdSql
=
tdCom
.
newTdSql
()
threads
.
append
(
threading
.
Thread
(
target
=
clusterComCreate
.
create_databases
,
args
=
(
newTdSql
,
dbNameIndex
,
paraDict
[
"dbNumbers"
],
paraDict
[
"dropFlag"
],
paraDict
[
"vgroups"
],
paraDict
[
'replica'
])))
for
tr
in
threads
:
tr
.
start
()
...
...
tests/system-test/6-cluster/clusterCommonCheck.py
浏览文件 @
410e15c5
...
...
@@ -39,6 +39,7 @@ class ClusterComCheck:
def
checkDnodes
(
self
,
dnodeNumbers
):
count
=
0
# print(tdSql)
while
count
<
5
:
tdSql
.
query
(
"show dnodes"
)
# tdLog.debug(tdSql.queryResult)
...
...
@@ -85,7 +86,7 @@ class ClusterComCheck:
tdLog
.
debug
(
"check %s_%d that status is ready "
%
(
dbNameIndex
,
j
))
else
:
continue
print
(
query_status
)
#
print(query_status)
count
+=
1
if
query_status
==
dbNumbers
:
tdLog
.
success
(
"we find cluster with %d dnode and check all databases are ready within 5s! "
%
dbNumbers
)
...
...
tests/system-test/6-cluster/clusterCommonCreate.py
浏览文件 @
410e15c5
...
...
@@ -125,7 +125,6 @@ class ClusterComCreate:
def
create_databases
(
self
,
tsql
,
dbNameIndex
,
dbNumbers
,
dropFlag
=
1
,
vgroups
=
4
,
replica
=
1
):
for
i
in
range
(
dbNumbers
):
print
(
dbNumbers
)
if
dropFlag
==
1
:
tsql
.
execute
(
"drop database if exists %s_%d"
%
(
dbNameIndex
,
i
))
tsql
.
execute
(
"create database if not exists %s_%d vgroups %d replica %d"
%
(
dbNameIndex
,
i
,
vgroups
,
replica
))
...
...
tests/system-test/fulltest.sh
浏览文件 @
410e15c5
...
...
@@ -121,7 +121,7 @@ python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3
python3 ./test.py
-f
6-cluster/5dnode3mnodeStopLoop.py
-N
5
-M
3
# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M 3
# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py -N 5 -M 3
#
python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py -N 5 -M 3
python3 ./test.py
-f
6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py
-N
5
-M
3
# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py -N 5 -M 3
# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateStb.py -N 5 -M 3
# python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py -N 5 -M 3
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录