From 9ef0b00803e67bf18051f118abd80d5fd66e082f Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 20 Aug 2021 17:12:42 +0300
Subject: [PATCH] fix config

---
 tests/config/config.d/merge_tree_settings.xml | 6 ++++++
 tests/config/install.sh                       | 1 +
 tests/config/users.d/timeouts.xml             | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tests/config/config.d/merge_tree_settings.xml

diff --git a/tests/config/config.d/merge_tree_settings.xml b/tests/config/config.d/merge_tree_settings.xml
new file mode 100644
index 00000000000..8c57dc3acfd
--- /dev/null
+++ b/tests/config/config.d/merge_tree_settings.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <merge_tree>
+        <!-- 10 seconds (default is 1 minute) -->
+        <zookeeper_session_expiration_check_period>10</zookeeper_session_expiration_check_period>
+    </merge_tree>
+</yandex>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 571dff34018..ea8c3ec56c8 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -28,6 +28,7 @@ ln -sf $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/merge_tree_settings.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
diff --git a/tests/config/users.d/timeouts.xml b/tests/config/users.d/timeouts.xml
index 6a1099c4404..7d58315bd94 100644
--- a/tests/config/users.d/timeouts.xml
+++ b/tests/config/users.d/timeouts.xml
@@ -6,8 +6,6 @@
             <http_receive_timeout>60</http_receive_timeout>
             <!-- 1 minute (default is 10 minutes) -->
             <insert_quorum_timeout>60000</insert_quorum_timeout>
-            <!-- 10 seconds (default is 1 minute) -->
-            <zookeeper_session_expiration_check_period>10</zookeeper_session_expiration_check_period>
             <!-- 30 seconds (default is 2 minutes) -->
             <replication_wait_for_inactive_replica_timeout>30</replication_wait_for_inactive_replica_timeout>
         </default>