thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-15 12:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add docker_exec and ClickHouseCluster.compose_cmd to reduce boilerplate

Browse Source
This commit is contained in:
Mikhail f. Shiryaev 2024-10-01 08:57:31 +02:00
parent 9a2c8916c9
commit 1fcbdb8b62
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
1 changed files with 72 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,11 @@ class PortPoolManager:
self.used_ports.clear() self.used_ports.clear()
def docker_exec(*args: str) -> Tuple[str, ...]:
"Function to ease the `docker exec -i...`"
return ("docker", "exec", "-i", *args)
def retry_exception(num, delay, func, exception=Exception, *args, **kwargs): def retry_exception(num, delay, func, exception=Exception, *args, **kwargs):
""" """
Retry if `func()` throws, `num` times. Retry if `func()` throws, `num` times.
@ -251,10 +256,7 @@ def get_docker_compose_path():
def check_kafka_is_available(kafka_id, kafka_port): def check_kafka_is_available(kafka_id, kafka_port):
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-i",
kafka_id, kafka_id,
"/usr/bin/kafka-broker-api-versions", "/usr/bin/kafka-broker-api-versions",
"--bootstrap-server", "--bootstrap-server",
@ -269,14 +271,7 @@ def check_kafka_is_available(kafka_id, kafka_port):
def check_kerberos_kdc_is_available(kerberos_kdc_id): def check_kerberos_kdc_is_available(kerberos_kdc_id):
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(kerberos_kdc_id, "/etc/rc.d/init.d/krb5kdc", "status"),
"docker",
"exec",
"-i",
kerberos_kdc_id,
"/etc/rc.d/init.d/krb5kdc",
"status",
),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
) )
@ -286,7 +281,7 @@ def check_kerberos_kdc_is_available(kerberos_kdc_id):
def check_postgresql_java_client_is_available(postgresql_java_client_id): def check_postgresql_java_client_is_available(postgresql_java_client_id):
p = subprocess.Popen( p = subprocess.Popen(
("docker", "exec", "-i", postgresql_java_client_id, "java", "-version"), docker_exec(postgresql_java_client_id, "java", "-version"),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
) )
p.communicate() p.communicate()
@ -295,12 +290,9 @@ def check_postgresql_java_client_is_available(postgresql_java_client_id):
def check_rabbitmq_is_available(rabbitmq_id, cookie): def check_rabbitmq_is_available(rabbitmq_id, cookie):
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-e", "-e",
f"RABBITMQ_ERLANG_COOKIE={cookie}", f"RABBITMQ_ERLANG_COOKIE={cookie}",
"-i",
rabbitmq_id, rabbitmq_id,
"rabbitmqctl", "rabbitmqctl",
"await_startup", "await_startup",
@ -313,12 +305,9 @@ def check_rabbitmq_is_available(rabbitmq_id, cookie):
def rabbitmq_debuginfo(rabbitmq_id, cookie): def rabbitmq_debuginfo(rabbitmq_id, cookie):
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-e", "-e",
f"RABBITMQ_ERLANG_COOKIE={cookie}", f"RABBITMQ_ERLANG_COOKIE={cookie}",
"-i",
rabbitmq_id, rabbitmq_id,
"rabbitmq-diagnostics", "rabbitmq-diagnostics",
"status", "status",
@ -328,12 +317,9 @@ def rabbitmq_debuginfo(rabbitmq_id, cookie):
p.communicate() p.communicate()
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-e", "-e",
f"RABBITMQ_ERLANG_COOKIE={cookie}", f"RABBITMQ_ERLANG_COOKIE={cookie}",
"-i",
rabbitmq_id, rabbitmq_id,
"rabbitmq-diagnostics", "rabbitmq-diagnostics",
"listeners", "listeners",
@ -343,12 +329,9 @@ def rabbitmq_debuginfo(rabbitmq_id, cookie):
p.communicate() p.communicate()
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-e", "-e",
f"RABBITMQ_ERLANG_COOKIE={cookie}", f"RABBITMQ_ERLANG_COOKIE={cookie}",
"-i",
rabbitmq_id, rabbitmq_id,
"rabbitmq-diagnostics", "rabbitmq-diagnostics",
"environment", "environment",
@ -383,12 +366,9 @@ async def nats_connect_ssl(nats_port, user, password, ssl_ctx=None):
def enable_consistent_hash_plugin(rabbitmq_id, cookie): def enable_consistent_hash_plugin(rabbitmq_id, cookie):
p = subprocess.Popen( p = subprocess.Popen(
( docker_exec(
"docker",
"exec",
"-e", "-e",
f"RABBITMQ_ERLANG_COOKIE={cookie}", f"RABBITMQ_ERLANG_COOKIE={cookie}",
"-i",
rabbitmq_id, rabbitmq_id,
"rabbitmq-plugins", "rabbitmq-plugins",
"enable", "enable",
@ -797,6 +777,9 @@ class ClickHouseCluster:
self.port_pool = PortPoolManager() self.port_pool = PortPoolManager()
def compose_cmd(self, *args: str) -> List[str]:
return ["docker", "compose", "--project-name", self.project_name, *args]
@property @property
def kafka_port(self): def kafka_port(self):
if self._kafka_port: if self._kafka_port:
@ -1027,16 +1010,12 @@ class ClickHouseCluster:
self.with_zookeeper_secure = True self.with_zookeeper_secure = True
self.base_cmd.extend(["--file", zookeeper_docker_compose_path]) self.base_cmd.extend(["--file", zookeeper_docker_compose_path])
self.base_zookeeper_cmd = [ self.base_zookeeper_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
zookeeper_docker_compose_path, zookeeper_docker_compose_path,
] )
return self.base_zookeeper_cmd return self.base_zookeeper_cmd
def setup_zookeeper_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_zookeeper_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1060,16 +1039,12 @@ class ClickHouseCluster:
self.with_zookeeper = True self.with_zookeeper = True
self.base_cmd.extend(["--file", zookeeper_docker_compose_path]) self.base_cmd.extend(["--file", zookeeper_docker_compose_path])
self.base_zookeeper_cmd = [ self.base_zookeeper_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
zookeeper_docker_compose_path, zookeeper_docker_compose_path,
] )
return self.base_zookeeper_cmd return self.base_zookeeper_cmd
def setup_keeper_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_keeper_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1109,16 +1084,12 @@ class ClickHouseCluster:
self.with_zookeeper = True self.with_zookeeper = True
self.base_cmd.extend(["--file", keeper_docker_compose_path]) self.base_cmd.extend(["--file", keeper_docker_compose_path])
self.base_zookeeper_cmd = [ self.base_zookeeper_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
keeper_docker_compose_path, keeper_docker_compose_path,
] )
return self.base_zookeeper_cmd return self.base_zookeeper_cmd
def setup_mysql_client_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_mysql_client_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1129,16 +1100,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_mysql_client.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql_client.yml"),
] ]
) )
self.base_mysql_client_cmd = [ self.base_mysql_client_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_mysql_client.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql_client.yml"),
] )
return self.base_mysql_client_cmd return self.base_mysql_client_cmd
@ -1154,16 +1121,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql.yml")]
) )
self.base_mysql57_cmd = [ self.base_mysql57_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_mysql.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql.yml"),
] )
return self.base_mysql57_cmd return self.base_mysql57_cmd
@ -1179,16 +1142,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql_8_0.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql_8_0.yml")]
) )
self.base_mysql8_cmd = [ self.base_mysql8_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_mysql_8_0.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql_8_0.yml"),
] )
return self.base_mysql8_cmd return self.base_mysql8_cmd
@ -1206,16 +1165,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_mysql_cluster.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql_cluster.yml"),
] ]
) )
self.base_mysql_cluster_cmd = [ self.base_mysql_cluster_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_mysql_cluster.yml"), p.join(docker_compose_yml_dir, "docker_compose_mysql_cluster.yml"),
] )
return self.base_mysql_cluster_cmd return self.base_mysql_cluster_cmd
@ -1228,16 +1183,12 @@ class ClickHouseCluster:
env_variables["POSTGRES_LOGS_FS"] = "bind" env_variables["POSTGRES_LOGS_FS"] = "bind"
self.with_postgres = True self.with_postgres = True
self.base_postgres_cmd = [ self.base_postgres_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_postgres.yml"), p.join(docker_compose_yml_dir, "docker_compose_postgres.yml"),
] )
return self.base_postgres_cmd return self.base_postgres_cmd
def setup_postgres_cluster_cmd( def setup_postgres_cluster_cmd(
@ -1255,16 +1206,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_postgres_cluster.yml"), p.join(docker_compose_yml_dir, "docker_compose_postgres_cluster.yml"),
] ]
) )
self.base_postgres_cluster_cmd = [ self.base_postgres_cluster_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_postgres_cluster.yml"), p.join(docker_compose_yml_dir, "docker_compose_postgres_cluster.yml"),
] )
def setup_postgresql_java_client_cmd( def setup_postgresql_java_client_cmd(
self, instance, env_variables, docker_compose_yml_dir self, instance, env_variables, docker_compose_yml_dir
@ -1278,16 +1225,12 @@ class ClickHouseCluster:
), ),
] ]
) )
self.base_postgresql_java_client_cmd = [ self.base_postgresql_java_client_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_postgresql_java_client.yml"), p.join(docker_compose_yml_dir, "docker_compose_postgresql_java_client.yml"),
] )
def setup_hdfs_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_hdfs_cmd(self, instance, env_variables, docker_compose_yml_dir):
self.with_hdfs = True self.with_hdfs = True
@ -1299,16 +1242,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_hdfs.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_hdfs.yml")]
) )
self.base_hdfs_cmd = [ self.base_hdfs_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_hdfs.yml"), p.join(docker_compose_yml_dir, "docker_compose_hdfs.yml"),
] )
logging.debug("HDFS BASE CMD:{self.base_hdfs_cmd)}") logging.debug("HDFS BASE CMD:{self.base_hdfs_cmd)}")
return self.base_hdfs_cmd return self.base_hdfs_cmd
@ -1328,16 +1267,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_kerberized_hdfs.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberized_hdfs.yml"),
] ]
) )
self.base_kerberized_hdfs_cmd = [ self.base_kerberized_hdfs_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_kerberized_hdfs.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberized_hdfs.yml"),
] )
return self.base_kerberized_hdfs_cmd return self.base_kerberized_hdfs_cmd
def setup_kafka_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_kafka_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1352,16 +1287,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_kafka.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_kafka.yml")]
) )
self.base_kafka_cmd = [ self.base_kafka_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_kafka.yml"), p.join(docker_compose_yml_dir, "docker_compose_kafka.yml"),
] )
return self.base_kafka_cmd return self.base_kafka_cmd
def setup_kerberized_kafka_cmd( def setup_kerberized_kafka_cmd(
@ -1379,16 +1310,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_kerberized_kafka.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberized_kafka.yml"),
] ]
) )
self.base_kerberized_kafka_cmd = [ self.base_kerberized_kafka_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_kerberized_kafka.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberized_kafka.yml"),
] )
return self.base_kerberized_kafka_cmd return self.base_kerberized_kafka_cmd
def setup_kerberos_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_kerberos_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1401,16 +1328,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_kerberos_kdc.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberos_kdc.yml"),
] ]
) )
self.base_kerberos_kdc_cmd = [ self.base_kerberos_kdc_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_kerberos_kdc.yml"), p.join(docker_compose_yml_dir, "docker_compose_kerberos_kdc.yml"),
] )
return self.base_kerberos_kdc_cmd return self.base_kerberos_kdc_cmd
def setup_redis_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_redis_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1422,16 +1345,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_redis.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_redis.yml")]
) )
self.base_redis_cmd = [ self.base_redis_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_redis.yml"), p.join(docker_compose_yml_dir, "docker_compose_redis.yml"),
] )
return self.base_redis_cmd return self.base_redis_cmd
def setup_rabbitmq_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_rabbitmq_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1447,16 +1366,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_rabbitmq.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_rabbitmq.yml")]
) )
self.base_rabbitmq_cmd = [ self.base_rabbitmq_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_rabbitmq.yml"), p.join(docker_compose_yml_dir, "docker_compose_rabbitmq.yml"),
] )
return self.base_rabbitmq_cmd return self.base_rabbitmq_cmd
def setup_nats_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_nats_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1469,16 +1384,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_nats.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_nats.yml")]
) )
self.base_nats_cmd = [ self.base_nats_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_nats.yml"), p.join(docker_compose_yml_dir, "docker_compose_nats.yml"),
] )
return self.base_nats_cmd return self.base_nats_cmd
def setup_mongo_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_mongo_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1496,16 +1407,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_mongo.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_mongo.yml")]
) )
self.base_mongo_cmd = [ self.base_mongo_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_mongo.yml"), p.join(docker_compose_yml_dir, "docker_compose_mongo.yml"),
] )
return self.base_mongo_cmd return self.base_mongo_cmd
def setup_coredns_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_coredns_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1515,16 +1422,12 @@ class ClickHouseCluster:
["--file", p.join(docker_compose_yml_dir, "docker_compose_coredns.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_coredns.yml")]
) )
self.base_coredns_cmd = [ self.base_coredns_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_coredns.yml"), p.join(docker_compose_yml_dir, "docker_compose_coredns.yml"),
] )
return self.base_coredns_cmd return self.base_coredns_cmd
@ -1539,16 +1442,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_minio.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_minio.yml")]
) )
self.base_minio_cmd = [ self.base_minio_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_minio.yml"), p.join(docker_compose_yml_dir, "docker_compose_minio.yml"),
] )
return self.base_minio_cmd return self.base_minio_cmd
def setup_azurite_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_azurite_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1566,16 +1465,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_azurite.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_azurite.yml")]
) )
self.base_azurite_cmd = [ self.base_azurite_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_azurite.yml"), p.join(docker_compose_yml_dir, "docker_compose_azurite.yml"),
] )
return self.base_azurite_cmd return self.base_azurite_cmd
def setup_cassandra_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_cassandra_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1584,16 +1479,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_cassandra.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_cassandra.yml")]
) )
self.base_cassandra_cmd = [ self.base_cassandra_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_cassandra.yml"), p.join(docker_compose_yml_dir, "docker_compose_cassandra.yml"),
] )
return self.base_cassandra_cmd return self.base_cassandra_cmd
def setup_ldap_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_ldap_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1602,16 +1493,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_ldap.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_ldap.yml")]
) )
self.base_ldap_cmd = [ self.base_ldap_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_ldap.yml"), p.join(docker_compose_yml_dir, "docker_compose_ldap.yml"),
] )
return self.base_ldap_cmd return self.base_ldap_cmd
def setup_jdbc_bridge_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_jdbc_bridge_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1621,16 +1508,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_jdbc_bridge.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_jdbc_bridge.yml")]
) )
self.base_jdbc_bridge_cmd = [ self.base_jdbc_bridge_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_jdbc_bridge.yml"), p.join(docker_compose_yml_dir, "docker_compose_jdbc_bridge.yml"),
] )
return self.base_jdbc_bridge_cmd return self.base_jdbc_bridge_cmd
def setup_nginx_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_nginx_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1639,16 +1522,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_nginx.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_nginx.yml")]
) )
self.base_nginx_cmd = [ self.base_nginx_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_nginx.yml"), p.join(docker_compose_yml_dir, "docker_compose_nginx.yml"),
] )
return self.base_nginx_cmd return self.base_nginx_cmd
def setup_hive(self, instance, env_variables, docker_compose_yml_dir): def setup_hive(self, instance, env_variables, docker_compose_yml_dir):
@ -1656,16 +1535,12 @@ class ClickHouseCluster:
self.base_cmd.extend( self.base_cmd.extend(
["--file", p.join(docker_compose_yml_dir, "docker_compose_hive.yml")] ["--file", p.join(docker_compose_yml_dir, "docker_compose_hive.yml")]
) )
self.base_hive_cmd = [ self.base_hive_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_hive.yml"), p.join(docker_compose_yml_dir, "docker_compose_hive.yml"),
] )
return self.base_hive_cmd return self.base_hive_cmd
def setup_prometheus_cmd(self, instance, env_variables, docker_compose_yml_dir): def setup_prometheus_cmd(self, instance, env_variables, docker_compose_yml_dir):
@ -1693,16 +1568,12 @@ class ClickHouseCluster:
p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"), p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"),
] ]
) )
self.base_prometheus_cmd = [ self.base_prometheus_cmd = self.compose_cmd(
"docker",
"compose",
"--env-file", "--env-file",
instance.env_file, instance.env_file,
"--project-name",
self.project_name,
"--file", "--file",
p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"), p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"),
] )
return self.base_prometheus_cmd return self.base_prometheus_cmd
def add_instance( def add_instance(