Move all yaml tests to clickhouse config

2024-11-21 15:12:02 +00:00 · 2021-09-23 11:08:40 +03:00 · 2021-09-23 11:08:40 +03:00 · d1bb8d666e
commit d1bb8d666e
parent 3bea8d5201
38 changed files with 94 additions and 93 deletions
--- a/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
@ -2,6 +2,6 @@ user_directories:
  users_xml:
    path: users.xml
  local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
  "@replace": replace

--- a/tests/integration/test_config_xml_main/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
  - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
  - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
  - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
  - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
  - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
  - "@replace": replace
--- a/tests/integration/test_config_xml_main/configs/config.xml
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <logger>
        <level>trace</level>
        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@ -64,10 +64,10 @@

    <mmap_cache_size>1000</mmap_cache_size>

-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>

-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
    <ldap_servers>
    </ldap_servers>
    <user_directories>
@ -274,4 +274,4 @@
        <anonymize>false</anonymize>
        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
    </send_crash_reports>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_main/configs/embedded.xml
+++ b/tests/integration/test_config_xml_main/configs/embedded.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
    <logger>
        <level>trace</level>
        <console>true</console>
@ -37,4 +37,4 @@
    <quotas>
        <default />
    </quotas>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_main/configs/users.xml
+++ b/tests/integration/test_config_xml_main/configs/users.xml
@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <profiles>
        <default>
            <max_memory_usage>10000000000</max_memory_usage>
@ -16,4 +16,4 @@
            <profile>default</profile>
        </default>
    </users>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_main/test.py
+++ b/tests/integration/test_config_xml_main/test.py
@ -32,7 +32,7 @@ def test_xml_main_conf():
    all_userd = ['configs/users.d/allow_introspection_functions.yaml',
                'configs/users.d/log_queries.yaml']

-    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False)
+    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False, config_root_name='clickhouse')

    try:
        cluster.start()
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
@ -2,6 +2,6 @@ user_directories:
  users_xml:
    path: users.yaml
  local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
  "@replace": replace

--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <keeper_server>
        <tcp_port>9181</tcp_port>
        <server_id>1</server_id>
@ -20,4 +20,4 @@
            </server>
        </raft_configuration>
    </keeper_server>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <logger>
        <!-- Disable rotation
             https://pocoproject.org/docs/Poco.FileChannel.html
        -->
        <size>never</size>
    </logger>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <metric_log>
        <database>system</database>
        <table>metric_log</table>
        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
    </metric_log>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <part_log>
        <database>system</database>
        <table>part_log</table>

        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
    </part_log>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
  - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
  - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
  - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
  - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
  - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
  - "@replace": replace
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
    <query_masking_rules>
        <rule>
            <regexp>TOPSECRET.TOPSECRET</regexp>
            <replace>[hidden]</replace>
        </rule>
    </query_masking_rules>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <remote_servers>
        <test_cluster_with_incorrect_pw>
             <shard>
@ -18,4 +18,4 @@
             </shard>
         </test_cluster_with_incorrect_pw>
    </remote_servers>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <zookeeper>
        <node index="1">
            <host>localhost</host>
            <port>9181</port>
        </node>
    </zookeeper>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <logger>
        <level>trace</level>
        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@ -64,10 +64,10 @@

    <mmap_cache_size>1000</mmap_cache_size>

-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>

-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
    <ldap_servers>
    </ldap_servers>
    <user_directories>
@ -274,4 +274,4 @@
        <anonymize>false</anonymize>
        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
    </send_crash_reports>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
    <logger>
        <level>trace</level>
        <console>true</console>
@ -37,4 +37,4 @@
    <quotas>
        <default />
    </quotas>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <profiles>
        <default>
            <allow_introspection_functions>1</allow_introspection_functions>
        </default>
    </profiles>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/test.py
+++ b/tests/integration/test_config_xml_yaml_mix/test.py
@ -32,7 +32,7 @@ def test_extra_yaml_mix():
                'configs/users.d/log_queries.yaml']

    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False,
-    users_config_name="users.yaml", copy_common_configs=False)
+                                users_config_name="users.yaml", copy_common_configs=False, config_root_name="clickhouse")

    try:
        cluster.start()
--- a/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
    <user_directories replace="replace">
        <users_xml>
@ -7,7 +7,7 @@
        </users_xml>
        <local_directory>
            <!-- Path to folder where users created by SQL commands are stored. -->
-            <path>access/</path>
+            <path>/var/lib/clickhouse/access/</path>
        </local_directory>
    </user_directories>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <keeper_server>
        <tcp_port>9181</tcp_port>
        <server_id>1</server_id>
@ -20,4 +20,4 @@
            </server>
        </raft_configuration>
    </keeper_server>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
    <logger>
        <console>true</console>
        <log remove="remove"/>
        <errorlog remove="remove"/>
    </logger>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <logger>
        <!-- Disable rotation
             https://pocoproject.org/docs/Poco.FileChannel.html
        -->
        <size>never</size>
    </logger>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <macros>
        <test>Hello, world!</test>
        <shard>s1</shard>
@ -6,4 +6,4 @@
        <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
        <default_name_test>table_{table}</default_name_test>
    </macros>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <metric_log>
        <database>system</database>
        <table>metric_log</table>
        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
    </metric_log>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <remote_servers>

        <![CDATA[
@ -46,4 +46,4 @@
        </two_shards_one_local_one_remote_at_port_9001>

    </remote_servers>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <part_log>
        <database>system</database>
        <table>part_log</table>

        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
    </part_log>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/path.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
@ -1,8 +1,8 @@
-<yandex>
-    <path replace="replace">./</path>
-    <tmp_path replace="replace">./tmp/</tmp_path>
-    <user_files_path replace="replace">./user_files/</user_files_path>
-    <format_schema_path replace="replace">./format_schemas/</format_schema_path>
-    <access_control_path replace="replace">./access/</access_control_path>
-    <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
-</yandex>
+<clickhouse>
+    <path replace="replace">/var/lib/clickhouse</path>
+    <tmp_path replace="replace">/var/lib/clickhouse/tmp/</tmp_path>
+    <user_files_path replace="replace">/var/lib/clickhouse/user_files/</user_files_path>
+    <format_schema_path replace="replace">/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <access_control_path replace="replace">/var/lib/clickhouse/access/</access_control_path>
+    <top_level_domains_path replace="replace">/var/lib/clickhouse/top_level_domains/</top_level_domains_path>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
    <query_masking_rules>
        <rule>
            <regexp>TOPSECRET.TOPSECRET</regexp>
            <replace>[hidden]</replace>
        </rule>
    </query_masking_rules>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
    <tcp_with_proxy_port>9010</tcp_with_proxy_port>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <remote_servers>
        <test_cluster_with_incorrect_pw>
             <shard>
@ -18,4 +18,4 @@
             </shard>
         </test_cluster_with_incorrect_pw>
    </remote_servers>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
    <text_log>
        <database>system</database>
        <table>text_log</table>
        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
    </text_log>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
    <zookeeper>
        <node index="1">
            <host>localhost</host>
            <port>9181</port>
        </node>
    </zookeeper>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.yaml
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@ -48,9 +48,9 @@ total_memory_tracker_sample_probability: 0
 uncompressed_cache_size: 8589934592
 mark_cache_size: 5368709120
 mmap_cache_size: 1000
-path: /var/lib/clickhouse/
-tmp_path: /var/lib/clickhouse/tmp/
-user_files_path: /var/lib/clickhouse/user_files/
+path: ./
+tmp_path: ./tmp/
+user_files_path: ./user_files/
 ldap_servers: ''
 user_directories:
  users_xml:
--- a/tests/integration/test_config_yaml_main/configs/embedded.xml
+++ b/tests/integration/test_config_yaml_main/configs/embedded.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
    <logger>
        <level>trace</level>
        <console>true</console>
@ -37,4 +37,4 @@
    <quotas>
        <default />
    </quotas>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <profiles>
        <default>
            <allow_introspection_functions>1</allow_introspection_functions>
        </default>
    </profiles>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
    <profiles>
        <default>
            <log_queries>1</log_queries>
        </default>
    </profiles>
-</yandex>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/test.py
+++ b/tests/integration/test_config_yaml_main/test.py
@ -32,7 +32,8 @@ def test_yaml_main_conf():
                'configs/users.d/log_queries.xml']

    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd,
-    with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml",
+                                copy_common_configs=False, config_root_name="clickhouse")

    try:
        cluster.start()