Replace duplicate development config files with symlinks. (#16486)

* Fix test "max_memory_usage_for_user"

* Update test

* Update annoying boilerplate

* Support symlinks in tarballs

* Fix Fuzzer

* Remove "secondary" user

* Remove "secondary" user

docker/packager/binary/build.sh

@@ -63,7 +63,7 @@ then
     mkdir -p /output/config
     cp ../programs/server/config.xml /output/config
     cp ../programs/server/users.xml /output/config
-    cp -r ../programs/server/config.d /output/config
+    cp -r --dereference ../programs/server/config.d /output/config
     tar -czvf "$COMBINED_OUTPUT.tgz" /output
     rm -r /output/*
     mv "$COMBINED_OUTPUT.tgz" /output

docker/test/fuzzer/run-fuzzer.sh

@@ -45,11 +45,11 @@ function configure
 {
     rm -rf db ||:
     mkdir db ||:
-    cp -av "$repo_dir"/programs/server/config* db
-    cp -av "$repo_dir"/programs/server/user* db
+    cp -av --dereference "$repo_dir"/programs/server/config* db
+    cp -av --dereference "$repo_dir"/programs/server/user* db
     # TODO figure out which ones are needed
-    cp -av "$repo_dir"/tests/config/config.d/listen.xml db/config.d
-    cp -av "$script_dir"/query-fuzzer-tweaks-users.xml db/users.d
+    cp -av --dereference "$repo_dir"/tests/config/config.d/listen.xml db/config.d
+    cp -av --dereference "$script_dir"/query-fuzzer-tweaks-users.xml db/users.d
 }
 
 function watchdog
@@ -89,7 +89,7 @@ function fuzz
         > >(tail -10000 > fuzzer.log) \
         2>&1 \
         || fuzzer_exit_code=$?
-    
+
     echo "Fuzzer exit code is $fuzzer_exit_code"
 
     ./clickhouse-client --query "select elapsed, query from system.processes" ||:

programs/server/config.d/macros.xml

@@ -1,5 +0,0 @@
-<yandex>
-    <macros>
-        <test>Hello, world!</test>
-    </macros>
-</yandex>

programs/server/config.d/macros.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/macros.xml

programs/server/config.d/metric_log.xml

@@ -1,8 +0,0 @@
-<yandex>
-    <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>

programs/server/config.d/metric_log.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/metric_log.xml

programs/server/config.d/part_log.xml

@@ -1,7 +0,0 @@
-<yandex>
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </part_log>
-</yandex>

programs/server/config.d/part_log.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/part_log.xml

programs/server/config.d/query_masking_rules.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!-- Config for test server -->
-<yandex>
-    <query_masking_rules>
-        <!-- An example of query masking rule to remove profanity.
-             This is an example for developers. Practical examples will include something like masking of SSN or credit card numbers.
-          -->
-        <rule>
-            <name>profanity</name>
-            <regexp>(?i:shit)</regexp>
-            <replace>substance</replace>
-        </rule>
-        <!-- This rule is used in tests. -->
-        <rule>
-            <regexp>TOPSECRET.TOPSECRET</regexp>
-            <replace>[hidden]</replace>
-        </rule>
-    </query_masking_rules>
-</yandex>

programs/server/config.d/query_masking_rules.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/query_masking_rules.xml

programs/server/config.d/text_log.xml

@@ -1,7 +0,0 @@
-<yandex>
-    <text_log>
-        <database>system</database>
-        <table>text_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </text_log>
-</yandex>

programs/server/config.d/text_log.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/text_log.xml

programs/server/config.d/zookeeper.xml

@@ -1,5 +0,0 @@
-<yandex>
-    <zookeeper>
-        <implementation>testkeeper</implementation>
-    </zookeeper>
-</yandex>

programs/server/config.d/zookeeper.xml

@@ -0,0 +1 @@
+../../../tests/config/config.d/zookeeper.xml

programs/server/users.d/access_management.xml

@@ -1,7 +0,0 @@
-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>

programs/server/users.d/access_management.xml

@@ -0,0 +1 @@
+../../../tests/config/users.d/access_management.xml

programs/server/users.d/log_queries.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-        </default>
-    </profiles>
-</yandex>

programs/server/users.d/log_queries.xml

@@ -0,0 +1 @@
+../../../tests/config/users.d/log_queries.xml

programs/server/users.d/readonly.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <!-- Profile that allows only read queries. -->
-        <readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-
-    <users>
-        <readonly>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::1</ip>
-                <ip>127.0.0.1</ip>
-            </networks>
-            <profile>readonly</profile>
-            <quota>default</quota>
-        </readonly>
-    </users>
-</yandex>

programs/server/users.d/readonly.xml

@@ -0,0 +1 @@
+../../../tests/config/users.d/readonly.xml