Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
怡红公子⭕
TDengine
提交
d3747f6b
T
TDengine
项目概览
怡红公子⭕
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
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,发现更多精彩内容 >>
提交
d3747f6b
编写于
5月 14, 2020
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into feature/2.0tsdb
上级
e7a165bf
ddc68fb7
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
157 addition
and
62 deletion
+157
-62
src/mnode/src/mgmtDnode.c
src/mnode/src/mgmtDnode.c
+1
-0
src/mnode/src/mgmtTable.c
src/mnode/src/mgmtTable.c
+8
-7
src/mnode/src/mgmtVgroup.c
src/mnode/src/mgmtVgroup.c
+1
-1
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+0
-1
tests/script/general/db/delete.sim
tests/script/general/db/delete.sim
+59
-0
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+8
-7
tests/script/unique/db/commit.sim
tests/script/unique/db/commit.sim
+2
-2
tests/script/unique/db/delete.sim
tests/script/unique/db/delete.sim
+45
-6
tests/script/unique/dnode/vnode_clean.sim
tests/script/unique/dnode/vnode_clean.sim
+33
-38
未找到文件。
src/mnode/src/mgmtDnode.c
浏览文件 @
d3747f6b
...
...
@@ -74,6 +74,7 @@ static int32_t mgmtDnodeActionDelete(SSdbOper *pOper) {
SDnodeObj
*
pDnode
=
pOper
->
pObj
;
#ifndef _SYNC
//TODO: drop dnode local
mgmtDropAllDnodeVgroups
(
pDnode
);
#endif
mgmtDropMnodeLocal
(
pDnode
->
dnodeId
);
...
...
src/mnode/src/mgmtTable.c
浏览文件 @
d3747f6b
...
...
@@ -546,6 +546,7 @@ static void *mgmtGetSuperTableByUid(uint64_t uid) {
pIter
=
mgmtGetNextSuperTable
(
pIter
,
&
pStable
);
if
(
pStable
==
NULL
)
break
;
if
(
pStable
->
uid
==
uid
)
{
sdbFreeIter
(
pIter
);
return
pStable
;
}
mgmtDecTableRef
(
pStable
);
...
...
@@ -1459,15 +1460,15 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) {
return
;
}
int32_t
sid
=
taosAllocateId
(
pVgroup
->
idPool
);
if
(
sid
<=
0
)
{
mTrace
(
"tables:%s, no enough sid in vgId:%d"
,
pCreate
->
tableId
,
pVgroup
->
vgId
);
mgmtCreateVgroup
(
mgmtCloneQueuedMsg
(
pMsg
),
pMsg
->
pDb
);
return
;
}
if
(
pMsg
->
retry
==
0
)
{
if
(
pMsg
->
pTable
==
NULL
)
{
int32_t
sid
=
taosAllocateId
(
pVgroup
->
idPool
);
if
(
sid
<=
0
)
{
mTrace
(
"tables:%s, no enough sid in vgId:%d"
,
pCreate
->
tableId
,
pVgroup
->
vgId
);
mgmtCreateVgroup
(
mgmtCloneQueuedMsg
(
pMsg
),
pMsg
->
pDb
);
return
;
}
pMsg
->
pTable
=
(
STableObj
*
)
mgmtDoCreateChildTable
(
pCreate
,
pVgroup
,
sid
);
mgmtIncTableRef
(
pMsg
->
pTable
);
}
...
...
src/mnode/src/mgmtVgroup.c
浏览文件 @
d3747f6b
...
...
@@ -666,7 +666,6 @@ static SMDDropVnodeMsg *mgmtBuildDropVnodeMsg(int32_t vgId) {
}
void
mgmtSendDropVnodeMsg
(
int32_t
vgId
,
SRpcIpSet
*
ipSet
,
void
*
ahandle
)
{
mTrace
(
"vgId:%d, send drop vnode msg, ahandle:%p"
,
vgId
,
ahandle
);
SMDDropVnodeMsg
*
pDrop
=
mgmtBuildDropVnodeMsg
(
vgId
);
SRpcMsg
rpcMsg
=
{
.
handle
=
ahandle
,
...
...
@@ -682,6 +681,7 @@ static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) {
mTrace
(
"vgId:%d, send drop all vnodes msg, ahandle:%p"
,
pVgroup
->
vgId
,
ahandle
);
for
(
int32_t
i
=
0
;
i
<
pVgroup
->
numOfVnodes
;
++
i
)
{
SRpcIpSet
ipSet
=
mgmtGetIpSetFromIp
(
pVgroup
->
vnodeGid
[
i
].
pDnode
->
dnodeEp
);
mTrace
(
"vgId:%d, send drop vnode msg to dnode:%d, ahandle:%p"
,
pVgroup
->
vgId
,
pVgroup
->
vnodeGid
[
i
].
dnodeId
,
ahandle
);
mgmtSendDropVnodeMsg
(
pVgroup
->
vgId
,
&
ipSet
,
ahandle
);
}
}
...
...
src/vnode/src/vnodeMain.c
浏览文件 @
d3747f6b
...
...
@@ -352,7 +352,6 @@ static void vnodeBuildVloadMsg(SVnodeObj *pVnode, SDMStatusMsg *pStatus) {
pLoad
->
status
=
pVnode
->
status
;
pLoad
->
role
=
pVnode
->
role
;
pLoad
->
replica
=
pVnode
->
syncCfg
.
replica
;
pStatus
->
openVnodes
++
;
}
void
vnodeBuildStatusMsg
(
void
*
param
)
{
...
...
tests/script/general/db/delete.sim
0 → 100644
浏览文件 @
d3747f6b
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c wallevel -v 2
system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
print ========= start dnodes
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print ======== step1
sql create database db blocks 2 maxtables 1000
sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int)
$tbPrefix = db.t
$i = 0
while $i < 2000
$tb = $tbPrefix . $i
sql create table $tb using db.mt tags( $i )
$i = $i + 1
endw
print ======== step2
sleep 1000
sql drop database db
sql show databases
if $rows != 0 then
return -1
endi
sleep 1000
sql show dnodes
print dnode1 openVnodes $data2_1
if $data2_1 != 0 then
return -1
endi
print ======= step3
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 1000
system sh/exec.sh -n dnode1 -s start
$x = 0
step3:
$x = $x + 1
sleep 2000
if $x == 30 then
return -1
endi
sql show mnodes
print dnode1 role $data2_1
if $data2_1 != master then
goto step3
endi
sleep 1000
system sh/exec.sh -n dnode1 -s stop -x SIGINT
tests/script/jenkins/basic.txt
浏览文件 @
d3747f6b
...
...
@@ -49,6 +49,7 @@ cd ../../../debug; make
./test.sh -f general/db/basic3.sim
./test.sh -f general/db/basic4.sim
./test.sh -f general/db/basic5.sim
./test.sh -f unique/db/delete.sim
./test.sh -f general/db/delete_reuse1.sim
./test.sh -f general/db/delete_reuse2.sim
./test.sh -f general/db/delete_reusevnode.sim
...
...
@@ -243,15 +244,15 @@ cd ../../../debug; make
#slguan ./test.sh -u -f unique/big/maxvnodes.sim
./test.sh -u -f unique/big/tcp.sim
#
#
./test.sh -u -f unique/cluster/balance1.sim
#
#
./test.sh -u -f unique/cluster/balance2.sim
#
#
./test.sh -u -f unique/cluster/balance3.sim
#
jeff
./test.sh -u -f unique/cluster/balance1.sim
#
jeff
./test.sh -u -f unique/cluster/balance2.sim
#
jeff
./test.sh -u -f unique/cluster/balance3.sim
#./test.sh -u -f unique/cluster/cache.sim
./test.sh -u -f unique/column/replica3.sim
#./test.sh -u -f unique/db/commit.sim
#
./test.sh -u -f unique/db/delete.sim
#
hongze
./test.sh -u -f unique/db/commit.sim
./test.sh -u -f unique/db/delete.sim
#./test.sh -u -f unique/db/delete_part.sim
##./test.sh -u -f unique/db/replica_add12.sim
##./test.sh -u -f unique/db/replica_add13.sim
...
...
@@ -269,7 +270,7 @@ cd ../../../debug; make
##./test.sh -u -f unique/dnode/offline2.sim
./test.sh -u -f unique/dnode/remove1.sim
#hongze ./test.sh -u -f unique/dnode/remove2.sim
#
./test.sh -u -f unique/dnode/vnode_clean.sim
./test.sh -u -f unique/dnode/vnode_clean.sim
./test.sh -u -f unique/http/admin.sim
./test.sh -u -f unique/http/opentsdb.sim
...
...
@@ -302,6 +303,6 @@ cd ../../../debug; make
#./test.sh -u -f unique/vnode/replica2_basic.sim
./test.sh -u -f unique/vnode/replica2_basic2.sim
#./test.sh -u -f unique/vnode/replica2_repeat.sim
#
#
./test.sh -u -f unique/vnode/replica3_basic.sim
#
hongze
./test.sh -u -f unique/vnode/replica3_basic.sim
#./test.sh -u -f unique/vnode/replica3_repeat.sim
#./test.sh -u -f unique/vnode/replica3_vgroup.sim
tests/script/unique/db/commit.sim
浏览文件 @
d3747f6b
...
...
@@ -72,8 +72,8 @@ sql import into tb values (now - 10d , -10 )
sql import into tb values (now - 11d , -11 )
sql select * from tb order by ts desc
print ===> rows $rows
print ===> last $data01
print ===> rows $rows
expect $num
print ===> last $data01
expect $data01
if $rows != $num then
return -1
...
...
tests/script/unique/db/delete.sim
浏览文件 @
d3747f6b
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
...
...
@@ -18,20 +15,20 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
print ========= start dnodes
system sh/exec_up.sh -n dnode1 -s start
sleep 3000
sql connect
sql create dnode $hostname2
system sh/exec_up.sh -n dnode2 -s start
sql create dnode $hostname3
system sh/exec_up.sh -n dnode3 -s start
sleep 3000
print ======== step1
sql create database db replica 3
ablocks 2 tblocks 5 maxtables 10
000
sql create database db replica 3
blocks 2 maxtables 1
000
sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int)
$tbPrefix = db.t
$i = 0
while $i <
100
000
while $i <
2
000
$tb = $tbPrefix . $i
sql create table $tb using db.mt tags( $i )
$i = $i + 1
...
...
@@ -45,6 +42,48 @@ if $rows != 0 then
return -1
endi
sleep 3000
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 0 then
return -1
endi
if $data2_2 != 0 then
return -1
endi
if $data2_3 != 0 then
return -1
endi
print ======== step3
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode2 -s stop -x SIGINT
system sh/exec.sh -n dnode3 -s stop -x SIGINT
sleep 1000
system sh/exec.sh -n dnode1 -s start -t
system sh/exec.sh -n dnode2 -s start -t
system sh/exec.sh -n dnode3 -s start -t
$x = 0
step3:
$x = $x + 1
sleep 2000
if $x == 10 then
return -1
endi
sql show mnodes
print dnode1 role $data2_1
if $data2_1 != master then
goto step3
endi
sleep 1000
system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
...
...
tests/script/unique/dnode/vnode_clean.sim
浏览文件 @
d3747f6b
...
...
@@ -29,7 +29,7 @@ sql insert into d1.t1 values(now+5s, 11)
sql show dnodes
print dnode1 openVnodes $data2_1
if $data2_1 !=
3
then
if $data2_1 !=
1
then
return -1
endi
...
...
@@ -41,16 +41,16 @@ $x = 0
show2:
$x = $x + 1
sleep 2000
if $x ==
3
0 then
if $x ==
1
0 then
return -1
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
if $data2_1 !=
4
then
if $data2_1 !=
0
then
goto show2
endi
if $data2_2 !=
3
then
if $data2_2 !=
1
then
goto show2
endi
...
...
@@ -68,7 +68,7 @@ $x = 0
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
if $data2_1 !=
4
then
if $data2_1 !=
0
then
return -1
endi
if $data2_2 != 2 then
...
...
@@ -82,7 +82,7 @@ $x = 0
show4:
$x = $x + 1
sleep 2000
if $x ==
3
0 then
if $x ==
1
0 then
return -1
endi
sql show dnodes
...
...
@@ -91,7 +91,7 @@ print dnode2 openVnodes $data2_2
if $data2_1 != 2 then
goto show4
endi
if $data2_2 !=
NULL
then
if $data2_2 !=
null
then
goto show4
endi
if $rows != 1 then
...
...
@@ -102,13 +102,8 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
print ========== step5
sleep 2000
sql create dnode $hostname2
system sh/deploy.sh -n dnode2 -i 2
system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
system sh/cfg.sh -n dnode2 -c wallevel -v 1
system sh/exec_up.sh -n dnode2 -s start
sql create dnode $hostname3
system sh/exec_up.sh -n dnode3 -s start
$x = 0
show5:
...
...
@@ -119,11 +114,11 @@ show5:
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode
2 openVnodes $data2_2
if $data2_1 !=
4
then
print dnode
3 openVnodes $data2_3
if $data2_1 !=
0
then
goto show5
endi
if $data2_
2
!= 2 then
if $data2_
3
!= 2 then
goto show5
endi
...
...
@@ -138,17 +133,17 @@ sql insert into d3.t3 values(now+5s, 31)
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_
2
if $data2_1 !=
4
then
print dnode2 openVnodes $data2_
3
if $data2_1 !=
0
then
return -1
endi
if $data2_
2 != 1
then
if $data2_
3 != 3
then
return -1
endi
print ========== step7
sql create dnode $hostname
3
system sh/exec_up.sh -n dnode
3
-s start
sql create dnode $hostname
4
system sh/exec_up.sh -n dnode
4
-s start
$x = 0
show7:
...
...
@@ -160,15 +155,15 @@ show7:
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 4 then
print dnode4 openVnodes $data2_4
if $data2_1 != 0 then
goto show7
endi
if $data2_
2
!= 2 then
if $data2_
3
!= 2 then
goto show7
endi
if $data2_
3 != 3
then
if $data2_
4 != 1
then
goto show7
endi
...
...
@@ -185,49 +180,49 @@ $x = 0
show8:
$x = $x + 1
sleep 2000
if $x ==
3
0 then
if $x ==
1
0 then
return -1
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 4 then
print dnode4 openVnodes $data2_4
if $data2_1 != 0 then
goto show8
endi
if $data2_
2
!= 2 then
if $data2_
3
!= 2 then
goto show8
endi
if $data2_
3
!= 2 then
if $data2_
4
!= 2 then
goto show8
endi
print ========== step9
sql drop dnode $hostname
2
sql drop dnode $hostname
3
$x = 0
show9:
$x = $x + 1
sleep 2000
if $x ==
3
0 then
if $x ==
1
0 then
return -1
endi
sql show dnodes
print dnode1 openVnodes $data2_1
print dnode2 openVnodes $data2_2
print dnode3 openVnodes $data2_3
if $data2_1 != 4 then
print dnode4 openVnodes $data2_4
if $data2_1 != 0 then
goto show9
endi
if $data2_
2 != NULL
then
if $data2_
3 != null
then
goto show9
endi
if $data2_
3 != 0
then
if $data2_
4 != 4
then
goto show9
endi
system sh/exec_up.sh -n dnode
2
-s stop -x SIGINT
system sh/exec_up.sh -n dnode
3
-s stop -x SIGINT
print ========== step10
sql select * from d1.t1 order by t desc
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录