mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Remove accident chage
This commit is contained in:
parent
5d94b7eec0
commit
64c4ade5b0
@ -195,12 +195,6 @@ class ClickHouseCluster:
|
|||||||
|
|
||||||
if tag is None:
|
if tag is None:
|
||||||
tag = self.docker_base_tag
|
tag = self.docker_base_tag
|
||||||
if not env_variables:
|
|
||||||
env_variables = {}
|
|
||||||
|
|
||||||
# Code coverage files will be placed in database directory
|
|
||||||
# (affect only WITH_COVERAGE=1 build)
|
|
||||||
env_variables['LLVM_PROFILE_FILE'] = '/var/lib/clickhouse/server_%h_%p_%m.profraw'
|
|
||||||
|
|
||||||
instance = ClickHouseInstance(
|
instance = ClickHouseInstance(
|
||||||
cluster=self,
|
cluster=self,
|
||||||
@ -227,7 +221,7 @@ class ClickHouseCluster:
|
|||||||
clickhouse_path_dir=clickhouse_path_dir,
|
clickhouse_path_dir=clickhouse_path_dir,
|
||||||
with_odbc_drivers=with_odbc_drivers,
|
with_odbc_drivers=with_odbc_drivers,
|
||||||
hostname=hostname,
|
hostname=hostname,
|
||||||
env_variables=env_variables,
|
env_variables=env_variables or {},
|
||||||
image=image,
|
image=image,
|
||||||
tag=tag,
|
tag=tag,
|
||||||
stay_alive=stay_alive,
|
stay_alive=stay_alive,
|
||||||
@ -765,11 +759,9 @@ class ClickHouseCluster:
|
|||||||
|
|
||||||
if kill:
|
if kill:
|
||||||
try:
|
try:
|
||||||
subprocess_check_call(self.base_cmd + ['stop', '--timeout', '20'])
|
|
||||||
except Exception as e:
|
|
||||||
print("Kill command failed during shutdown. {}".format(repr(e)))
|
|
||||||
print("Trying to kill forcefully")
|
|
||||||
subprocess_check_call(self.base_cmd + ['kill'])
|
subprocess_check_call(self.base_cmd + ['kill'])
|
||||||
|
except Exception as e:
|
||||||
|
print("Kill command failed durung shutdown. {}".format(repr(e)))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
subprocess_check_call(self.base_cmd + ['down', '--volumes', '--remove-orphans'])
|
subprocess_check_call(self.base_cmd + ['down', '--volumes', '--remove-orphans'])
|
||||||
|
Loading…
Reference in New Issue
Block a user