Merge pull request #43626 from ClickHouse/tavplubix-patch-7

Fix flaky 01175_distributed_ddl_output_mode_long
This commit is contained in:
Alexander Tokmakov 2022-11-25 13:31:21 +03:00 committed by GitHub
commit 5a5f2a0df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,7 +22,7 @@ function run_until_out_contains()
PATTERN=$1
shift
for ((i=MIN_TIMEOUT; i<10; i++))
for ((i=MIN_TIMEOUT; i<33; i=i*2))
do
"$@" --distributed_ddl_task_timeout="$i" > "$TMP_OUT" 2>&1
if grep -q "$PATTERN" "$TMP_OUT"
@ -37,7 +37,7 @@ RAND_COMMENT="01175_DDL_$RANDOM"
LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment ${CLICKHOUSE_LOG_COMMENT}/--log_comment ${LOG_COMMENT}}
CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 --database_atomic_wait_for_drop_and_detach_synchronously=0 "
CLIENT=${CLICKHOUSE_CLIENT_WITH_SETTINGS}
CLIENT+=" --distributed_ddl_task_timeout=$TIMEOUT "