diff --git a/test/integration/clickhouse-config.xml b/test/integration/clickhouse-config.xml
index 581055d1..6ab1feda 100644
--- a/test/integration/clickhouse-config.xml
+++ b/test/integration/clickhouse-config.xml
@@ -26,4 +26,36 @@
trace
1
+
+
+
+
+
+
+
+
+
+ 2000
+ 64
+ 64
+ 0.99
+
+ 268435456
+ 67108864
+ 16777216
+ false
+
+ 1
+ 2
+ 2
+ round_robin
+ 1
+ 1
+ 2
+ 8
+ 1
+ 1
+ 0
+ 0
+
diff --git a/test/integration/docker-compose_advanced.yml b/test/integration/docker-compose_advanced.yml
index 05fcc01b..c7ff4d5f 100644
--- a/test/integration/docker-compose_advanced.yml
+++ b/test/integration/docker-compose_advanced.yml
@@ -131,16 +131,27 @@ services:
volumes:
- pgsql:/var/lib/postgresql
+ # @todo return keeper back when resolve https://github.com/ClickHouse/ClickHouse/issues/72057
+ # zookeeper:
+ # image: docker.io/clickhouse/clickhouse-keeper:${CLICKHOUSE_KEEPER_VERSION:-latest-alpine}
+ # hostname: zookeeper
+ # volumes:
+ # - ./clickhouse-keeper.xml:/etc/clickhouse-keeper/conf.d/clickhouse-keeper.xml
+ # - /var/lib/clickhouse
+ # - /var/lib/clickhouse-keeper
+ # environment:
+ # - CLICKHOUSE_RUN_AS_ROOT=1
+ # healthcheck:
+ # test: bash -c 'if [[ "$$(echo 'ruok' | nc 127.0.0.1 2181)" == "imok" ]]; then exit 0; else exit 1; fi'
+ # interval: 1s
+ # timeout: 2s
+ # retries: 10
+ # start_period: 1s
zookeeper:
- image: docker.io/clickhouse/clickhouse-keeper:${CLICKHOUSE_KEEPER_VERSION:-latest-alpine}
+ image: ${ZOOKEEPER_IMAGE:-docker.io/zookeeper}:${ZOOKEEPER_VERSION:-latest}
hostname: zookeeper
- volumes:
- - ./clickhouse-keeper.xml:/etc/clickhouse-keeper/conf.d/clickhouse-keeper.xml
- - /var/lib/clickhouse
- - /var/lib/clickhouse-keeper
environment:
- - CLICKHOUSE_UID=0
- - CLICKHOUSE_GID=0
+ ZOO_4LW_COMMANDS_WHITELIST: "*"
healthcheck:
test: bash -c 'if [[ "$$(echo 'ruok' | nc 127.0.0.1 2181)" == "imok" ]]; then exit 0; else exit 1; fi'
interval: 1s
diff --git a/test/integration/dynamic_settings.sh b/test/integration/dynamic_settings.sh
index 8a970c0d..0f9b2428 100755
--- a/test/integration/dynamic_settings.sh
+++ b/test/integration/dynamic_settings.sh
@@ -490,4 +490,22 @@ cat < /etc/clickhouse-server/config.d/blob_storage_log.xml
EOT
+fi
+
+if [[ "$CLICKHOUSE_VERSION" == "head" || "${CLICKHOUSE_VERSION}" =~ ^19\.1[1-9] || "${CLICKHOUSE_VERSION}" =~ ^2[4-9\.[1-9] ]]; then
+
+cat < /etc/clickhouse-server/confid.d/merge_tree_low_memory.xml
+
+
+ 1024
+ 1073741824
+ 0
+
+ 1
+ 1
+
+
+
+EOT
+
fi
\ No newline at end of file