diff --git a/test/integration/docker-compose_advanced.yml b/test/integration/docker-compose_advanced.yml index c7ff4d5f..b489dc25 100644 --- a/test/integration/docker-compose_advanced.yml +++ b/test/integration/docker-compose_advanced.yml @@ -132,26 +132,15 @@ services: - 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: ${ZOOKEEPER_IMAGE:-docker.io/zookeeper}:${ZOOKEEPER_VERSION:-latest} + 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: - ZOO_4LW_COMMANDS_WHITELIST: "*" + - 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 @@ -159,7 +148,6 @@ services: retries: 10 start_period: 1s - clickhouse-backup: image: docker.io/${CLICKHOUSE_IMAGE:-yandex/clickhouse-server}:${CLICKHOUSE_VERSION:-19.17} hostname: clickhouse-backup diff --git a/test/integration/dynamic_settings.sh b/test/integration/dynamic_settings.sh index ea03d2c1..7ecc6345 100755 --- a/test/integration/dynamic_settings.sh +++ b/test/integration/dynamic_settings.sh @@ -522,7 +522,7 @@ fi -if [[ "${CLICKHOUSE_VERSION}" =~ ^20\.[8-9] ]]; then +if [[ "${CLICKHOUSE_VERSION}" =~ ^2[0]\. ]]; then cat <<EOT > /etc/clickhouse-server/users.d/low_memory_in_usersd.xml <yandex> @@ -547,6 +547,30 @@ cat <<EOT > /etc/clickhouse-server/config.d/low_memory_in_configd.xml </yandex> EOT +elif [[ "${CLICKHOUSE_VERSION}" =~ ^2[1]\. ]]; then + +cat <<EOT > /etc/clickhouse-server/users.d/low_memory_in_usersd.xml +<yandex> + <profiles> + <default> + <background_pool_size>2</background_pool_size> + <background_buffer_flush_schedule_pool_size>1</background_buffer_flush_schedule_pool_size> + <background_message_broker_schedule_pool_size>1</background_message_broker_schedule_pool_size> + <background_fetches_pool_size>1</background_fetches_pool_size> + </default> + </profiles> +</yandex> +EOT + +cat <<EOT > /etc/clickhouse-server/config.d/low_memory_in_configd.xml +<yandex> + <tables_loader_foreground_pool_size>0</tables_loader_foreground_pool_size> + <tables_loader_background_pool_size>0</tables_loader_background_pool_size> + <background_merges_mutations_scheduling_policy>round_robin</background_merges_mutations_scheduling_policy> + <background_merges_mutations_concurrency_ratio>2</background_merges_mutations_concurrency_ratio> +</yandex> +EOT + else cat <<EOT > /etc/clickhouse-server/config.d/low_memory_in_configd.xml