Skip to content
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

Merged
merged 3 commits into from
Sep 23, 2021
Merged

Fix YAML integration tests #29265

merged 3 commits into from
Sep 23, 2021

Conversation

alesapin
Copy link
Member

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

@robot-clickhouse robot-clickhouse added the pr-not-for-changelog This PR should not be mentioned in the changelog label Sep 22, 2021
@@ -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"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why it's needed?

Copy link
Member Author

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

Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("clickhouse");
. In integration tests we have several "predefined" configs, like
<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>
. In this configs we have <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.

@alesapin alesapin changed the title Fix YAML integration test Fix YAML integration tests Sep 23, 2021
@alesapin
Copy link
Member Author

Only flaky check is important

@nikitamikhaylov
Copy link
Member

Only flaky check is important

No flaky integration tests.

@nikitamikhaylov nikitamikhaylov merged commit e8ab9fe into master Sep 23, 2021
@nikitamikhaylov nikitamikhaylov deleted the fix_yaml_test branch September 23, 2021 12:12
@nikitamikhaylov nikitamikhaylov self-assigned this Sep 23, 2021
@alexey-milovidov
Copy link
Member

Fix test rocksdb

It did not help.

@alexey-milovidov
Copy link
Member

#29341

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-not-for-changelog This PR should not be mentioned in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants