Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
d04dd464
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d04dd464
编写于
8月 25, 2021
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/d1
上级
349d565d
77a920d2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
10 deletion
+12
-10
src/util/src/tcache.c
src/util/src/tcache.c
+2
-1
tests/pytest/util/dnodes-default.py
tests/pytest/util/dnodes-default.py
+2
-2
tests/pytest/util/dnodes-no-random-fail.py
tests/pytest/util/dnodes-no-random-fail.py
+2
-2
tests/pytest/util/dnodes-random-fail.py
tests/pytest/util/dnodes-random-fail.py
+2
-2
tests/pytest/util/dnodes.py
tests/pytest/util/dnodes.py
+4
-3
未找到文件。
src/util/src/tcache.c
浏览文件 @
d04dd464
...
@@ -537,7 +537,8 @@ void taosCacheCleanup(SCacheObj *pCacheObj) {
...
@@ -537,7 +537,8 @@ void taosCacheCleanup(SCacheObj *pCacheObj) {
pCacheObj
->
deleting
=
1
;
pCacheObj
->
deleting
=
1
;
// wait for the refresh thread quit before destroying the cache object.
// wait for the refresh thread quit before destroying the cache object.
while
(
atomic_load_8
(
&
pCacheObj
->
deleting
)
!=
0
)
{
// But in the dll, the child thread will be killed before atexit takes effect.So here we only wait for 2 seconds.
for
(
int
i
=
0
;
i
<
40
&&
atomic_load_8
(
&
pCacheObj
->
deleting
)
!=
0
;
i
++
)
{
taosMsleep
(
50
);
taosMsleep
(
50
);
}
}
...
...
tests/pytest/util/dnodes-default.py
浏览文件 @
d04dd464
...
@@ -60,7 +60,7 @@ class TDSimClient:
...
@@ -60,7 +60,7 @@ class TDSimClient:
self
.
cfgDict
.
update
({
option
:
value
})
self
.
cfgDict
.
update
({
option
:
value
})
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
@@ -320,7 +320,7 @@ class TDDnode:
...
@@ -320,7 +320,7 @@ class TDDnode:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
...
tests/pytest/util/dnodes-no-random-fail.py
浏览文件 @
d04dd464
...
@@ -58,7 +58,7 @@ class TDSimClient:
...
@@ -58,7 +58,7 @@ class TDSimClient:
self
.
cfgDict
.
update
({
option
:
value
})
self
.
cfgDict
.
update
({
option
:
value
})
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
@@ -318,7 +318,7 @@ class TDDnode:
...
@@ -318,7 +318,7 @@ class TDDnode:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
...
tests/pytest/util/dnodes-random-fail.py
浏览文件 @
d04dd464
...
@@ -58,7 +58,7 @@ class TDSimClient:
...
@@ -58,7 +58,7 @@ class TDSimClient:
self
.
cfgDict
.
update
({
option
:
value
})
self
.
cfgDict
.
update
({
option
:
value
})
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
@@ -318,7 +318,7 @@ class TDDnode:
...
@@ -318,7 +318,7 @@ class TDDnode:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
...
tests/pytest/util/dnodes.py
浏览文件 @
d04dd464
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
import
sys
import
sys
import
os
import
os
import
os.path
import
os.path
import
platform
import
subprocess
import
subprocess
from
time
import
sleep
from
time
import
sleep
from
util.log
import
*
from
util.log
import
*
...
@@ -58,7 +59,7 @@ class TDSimClient:
...
@@ -58,7 +59,7 @@ class TDSimClient:
self
.
cfgDict
.
update
({
option
:
value
})
self
.
cfgDict
.
update
({
option
:
value
})
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
@@ -243,7 +244,7 @@ class TDDnode:
...
@@ -243,7 +244,7 @@ class TDDnode:
projPath
=
selfPath
[:
selfPath
.
find
(
"tests"
)]
projPath
=
selfPath
[:
selfPath
.
find
(
"tests"
)]
for
root
,
dirs
,
files
in
os
.
walk
(
projPath
):
for
root
,
dirs
,
files
in
os
.
walk
(
projPath
):
if
(
"taosd"
in
files
):
if
(
(
"taosd"
)
in
files
):
rootRealPath
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
root
))
rootRealPath
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
root
))
if
(
"packaging"
not
in
rootRealPath
):
if
(
"packaging"
not
in
rootRealPath
):
buildPath
=
root
[:
len
(
root
)
-
len
(
"/build/bin"
)]
buildPath
=
root
[:
len
(
root
)
-
len
(
"/build/bin"
)]
...
@@ -401,7 +402,7 @@ class TDDnode:
...
@@ -401,7 +402,7 @@ class TDDnode:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
def
cfg
(
self
,
option
,
value
):
def
cfg
(
self
,
option
,
value
):
cmd
=
"echo
'%s %s'
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
cmd
=
"echo
%s %s
>> %s"
%
(
option
,
value
,
self
.
cfgPath
)
if
os
.
system
(
cmd
)
!=
0
:
if
os
.
system
(
cmd
)
!=
0
:
tdLog
.
exit
(
cmd
)
tdLog
.
exit
(
cmd
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录