thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve stability for hive intergration test

Browse Source
This commit is contained in:
lgbo-ustc 2022-06-21 15:59:54 +08:00
parent 633c3c8287
commit cdd7a54995
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/test/integration/runner/compose/docker_compose_hive.yml
View File

@ -1,7 +1,7 @@
version: '2.3'
services:
hdfs1:
image: lgboustc/hive_test:v1.0
image: lgboustc/hive_test:v2.0
hostname: hivetest
restart: always
entrypoint: bash /start.sh

2
docker/test/integration/runner/dockerd-entrypoint.sh
View File

@ -12,7 +12,7 @@ echo '{
"registry-mirrors" : ["http://dockerhub-proxy.dockerhub-proxy-zone:5000"]
}' | dd of=/etc/docker/daemon.json 2>/dev/null
dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --default-address-pool base=172.17.0.0/12,size=24 &>/ClickHouse/tests/integration/dockerd.log &
dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --default-address-pool base=172.16.0.1/12,size=24 &>/ClickHouse/tests/integration/dockerd.log &
set +e
reties=0

2
tests/integration/helpers/cluster.py
View File

@ -2396,7 +2396,7 @@ class ClickHouseCluster:
logging.debug("Setup hive")
subprocess_check_call(self.base_hive_cmd + common_opts)
self.up_called = True
time.sleep(300)
time.sleep(30)
if self.with_minio and self.base_minio_cmd:
# Copy minio certificates to minio/certs

2
tests/integration/test_hive_query/test.py
View File

@ -25,7 +25,7 @@ def started_cluster():
logging.info("Starting cluster ...")
cluster.start()
cluster.copy_file_to_container("roottesthivequery_hdfs1_1", "/etc/clickhouse-server/extra_conf.d/prepare_hive_data.sh", "/prepare_hive_data.sh")
cluster.copy_file_to_container("roottesthivequery_hdfs1_1", "/ClickHouse/tests/integration/test_hive_query/data/prepare_hive_data.sh", "/prepare_hive_data.sh")
cluster.exec_in_container("roottesthivequery_hdfs1_1", ["bash", "-c", "bash /prepare_hive_data.sh"])
yield cluster
finally: