Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
8f50a676
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8f50a676
编写于
9月 02, 2020
作者:
Y
Yatsishin Ilya
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bad merge
上级
5ab9f249
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
9 deletion
+30
-9
tests/integration/helpers/cluster.py
tests/integration/helpers/cluster.py
+30
-9
未找到文件。
tests/integration/helpers/cluster.py
浏览文件 @
8f50a676
...
...
@@ -40,7 +40,6 @@ SANITIZER_SIGN = "=================="
def
_create_env_file
(
path
,
variables
,
fname
=
DEFAULT_ENV_NAME
):
full_path
=
os
.
path
.
join
(
path
,
fname
)
with
open
(
full_path
,
'w'
)
as
f
:
f
.
write
(
'TSAN_OPTIONS="external_symbolizer_path=/usr/bin/llvm-symbolizer"
\n
'
)
for
var
,
value
in
variables
.
items
():
f
.
write
(
"="
.
join
([
var
,
value
])
+
"
\n
"
)
return
full_path
...
...
@@ -192,13 +191,36 @@ class ClickHouseCluster:
tag
=
self
.
docker_base_tag
instance
=
ClickHouseInstance
(
self
,
self
.
base_dir
,
name
,
base_config_dir
if
base_config_dir
else
self
.
base_config_dir
,
main_configs
or
[],
user_configs
or
[],
dictionaries
or
[],
macros
or
{},
with_zookeeper
,
self
.
zookeeper_config_path
,
with_mysql
,
with_kafka
,
with_rabbitmq
,
with_mongo
,
with_redis
,
with_minio
,
with_cassandra
,
self
.
server_bin_path
,
self
.
odbc_bridge_bin_path
,
clickhouse_path_dir
,
with_odbc_drivers
,
hostname
=
hostname
,
env_variables
=
env_variables
or
{},
image
=
image
,
tag
=
tag
,
stay_alive
=
stay_alive
,
ipv4_address
=
ipv4_address
,
cluster
=
self
,
base_path
=
self
.
base_dir
,
name
=
name
,
base_config_dir
=
base_config_dir
if
base_config_dir
else
self
.
base_config_dir
,
custom_main_configs
=
main_configs
or
[],
custom_user_configs
=
user_configs
or
[],
custom_dictionaries
=
dictionaries
or
[],
macros
=
macros
or
{},
with_zookeeper
=
with_zookeeper
,
zookeeper_config_path
=
self
.
zookeeper_config_path
,
with_mysql
=
with_mysql
,
with_kafka
=
with_kafka
,
with_rabbitmq
=
with_rabbitmq
,
with_mongo
=
with_mongo
,
with_redis
=
with_redis
,
with_minio
=
with_minio
,
with_cassandra
=
with_cassandra
,
server_bin_path
=
self
.
server_bin_path
,
odbc_bridge_bin_path
=
self
.
odbc_bridge_bin_path
,
clickhouse_path_dir
=
clickhouse_path_dir
,
with_odbc_drivers
=
with_odbc_drivers
,
hostname
=
hostname
,
env_variables
=
env_variables
or
{},
image
=
image
,
tag
=
tag
,
stay_alive
=
stay_alive
,
ipv4_address
=
ipv4_address
,
ipv6_address
=
ipv6_address
,
with_installed_binary
=
with_installed_binary
,
tmpfs
=
tmpfs
or
[])
with_installed_binary
=
with_installed_binary
,
tmpfs
=
tmpfs
or
[])
docker_compose_yml_dir
=
get_docker_compose_path
()
...
...
@@ -769,8 +791,7 @@ class ClickHouseInstance:
def
__init__
(
self
,
cluster
,
base_path
,
name
,
base_config_dir
,
custom_main_configs
,
custom_user_configs
,
custom_dictionaries
,
macros
,
with_zookeeper
,
zookeeper_config_path
,
with_mysql
,
with_kafka
,
with_rabbitmq
,
with_mongo
,
with_redis
,
with_minio
,
with_cassandra
,
server_bin_path
,
base_config_dir
,
clickhouse_path_dir
,
with_odbc_drivers
,
hostname
=
None
,
env_variables
=
None
,
with_cassandra
,
server_bin_path
,
odbc_bridge_bin_path
,
clickhouse_path_dir
,
with_odbc_drivers
,
hostname
=
None
,
env_variables
=
None
,
image
=
"yandex/clickhouse-integration-test"
,
tag
=
"latest"
,
stay_alive
=
False
,
ipv4_address
=
None
,
ipv6_address
=
None
,
with_installed_binary
=
False
,
tmpfs
=
None
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录