-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix YAML integration tests #29265
Fix YAML integration tests #29265
Conversation
@@ -760,7 +760,7 @@ def add_instance(self, name, base_config_dir=None, main_configs=None, user_confi | |||
hostname=None, env_variables=None, image="clickhouse/integration-test", tag=None, | |||
stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None, | |||
zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True, | |||
main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True): | |||
main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True, config_root_name="yandex"): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why it's needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because YAML configs doesn't have root tag. We just hardcoded "clickhouse" in YAMLParser
ClickHouse/src/Common/Config/YAMLParser.cpp
Line 159 in dbff8fd
Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("clickhouse"); |
ClickHouse/tests/integration/helpers/0_common_instance_config.xml
Lines 1 to 20 in dbff8fd
<yandex> | |
<timezone>Europe/Moscow</timezone> | |
<listen_host>0.0.0.0</listen_host> | |
<custom_settings_prefixes>custom_</custom_settings_prefixes> | |
<path>/var/lib/clickhouse/</path> | |
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path> | |
<!-- For tests which check compatibility with older versions. --> | |
<users_config>users.xml</users_config> | |
<logger> | |
<level>trace</level> | |
<log>/var/log/clickhouse-server/clickhouse-server.log</log> | |
<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog> | |
<size>1000M</size> | |
<count>10</count> | |
<stderr>/var/log/clickhouse-server/stderr.log</stderr> | |
<stdout>/var/log/clickhouse-server/stdout.log</stdout> | |
</logger> | |
</yandex> |
<yandex>
root tag. So when we try to run any test with YAML config we will be unable to start clickhouse (root tag mismatch). This parameter allows to change root tag in these "predefined" configs.
Only flaky check is important |
No flaky integration tests. |
It did not help. |
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Changelog category (leave one):