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

Revert "rename setting"

Browse Source 
This reverts commit 0b97cd49e8.
This commit is contained in:
Arthur Passos 2023-10-02 18:26:31 -03:00
parent 0b97cd49e8
commit 9695bf5db9
2 changed files with 304 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1536,7 +1536,7 @@ class ClickHouseCluster:
allow_analyzer=True, allow_analyzer=True,
hostname=None, hostname=None,
env_variables=None, env_variables=None,
instance_env_variables=False, exclusive_env_variables=False,
image="clickhouse/integration-test", image="clickhouse/integration-test",
tag=None, tag=None,
stay_alive=False, stay_alive=False,
@ -1646,7 +1646,7 @@ class ClickHouseCluster:
copy_common_configs=copy_common_configs, copy_common_configs=copy_common_configs,
hostname=hostname, hostname=hostname,
env_variables=env_variables, env_variables=env_variables,
instance_env_variables=instance_env_variables, exclusive_env_variables=exclusive_env_variables,
image=image, image=image,
tag=tag, tag=tag,
stay_alive=stay_alive, stay_alive=stay_alive,
@ -3187,7 +3187,7 @@ class ClickHouseInstance:
copy_common_configs=True, copy_common_configs=True,
hostname=None, hostname=None,
env_variables=None, env_variables=None,
instance_env_variables=False, exclusive_env_variables=False,
image="clickhouse/integration-test", image="clickhouse/integration-test",
tag="latest", tag="latest",
stay_alive=False, stay_alive=False,
@ -3277,7 +3277,7 @@ class ClickHouseInstance:
self.path = p.join(self.cluster.instances_dir, name) self.path = p.join(self.cluster.instances_dir, name)
self.docker_compose_path = p.join(self.path, "docker-compose.yml") self.docker_compose_path = p.join(self.path, "docker-compose.yml")
self.env_variables = env_variables or {} self.env_variables = env_variables or {}
self.instance_env_variables = instance_env_variables self.exclusive_env_variables = exclusive_env_variables
self.env_file = self.cluster.env_file self.env_file = self.cluster.env_file
if with_odbc_drivers: if with_odbc_drivers:
self.odbc_ini_path = self.path + "/odbc.ini:/etc/odbc.ini" self.odbc_ini_path = self.path + "/odbc.ini:/etc/odbc.ini"
@ -4396,7 +4396,7 @@ class ClickHouseInstance:
# In case the environment variables are exclusive, we don't want it to be in the cluster's env file. # In case the environment variables are exclusive, we don't want it to be in the cluster's env file.
# Instead, a separate env file will be created for the instance and needs to be filled with cluster's env variables. # Instead, a separate env file will be created for the instance and needs to be filled with cluster's env variables.
if self.instance_env_variables is True: if self.exclusive_env_variables is True:
self.env_variables.update(self.cluster.env_variables) self.env_variables.update(self.cluster.env_variables)
else: else:
self.cluster.env_variables.update(self.env_variables) self.cluster.env_variables.update(self.env_variables)
@ -4474,9 +4474,9 @@ class ClickHouseInstance:
# The current implementation of `self.env_variables` is not exclusive. Meaning the variables # The current implementation of `self.env_variables` is not exclusive. Meaning the variables
# are shared with all nodes within the same cluster, even if it is specified for a single node. # are shared with all nodes within the same cluster, even if it is specified for a single node.
# In order not to break the existing tests, the `self.instance_env_variables` option was added as a workaround. # In order not to break the existing tests, the `self.exclusive_env_variables` option was added as a workaround.
# IMHO, it would be better to make `self.env_variables` exclusive by defaultand remove the `self.instance_env_variables` option. # IMHO, it would be better to make `self.env_variables` exclusive by defaultand remove the `self.exclusive_env_variables` option.
if self.instance_env_variables: if self.exclusive_env_variables:
self.env_file = p.abspath(p.join(self.path, ".env")) self.env_file = p.abspath(p.join(self.path, ".env"))
_create_env_file(self.env_file, self.env_variables) _create_env_file(self.env_file, self.env_variables)

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

@ -32,7 +32,7 @@ def cluster():
env_variables={ env_variables={
"http_proxy": "http://proxy1", "http_proxy": "http://proxy1",
}, },
instance_env_variables=True, exclusive_env_variables=True,
) )
logging.info("Starting cluster...") logging.info("Starting cluster...")