From 0b42605053d720a65d1b96d1c1c41b97880583ce Mon Sep 17 00:00:00 2001 From: Anton Popov Date: Sat, 10 Dec 2022 14:02:12 +0000 Subject: [PATCH] fix flaky test '02497_trace_events_stress_long' --- .../02497_trace_events_stress_long.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/queries/0_stateless/02497_trace_events_stress_long.sh b/tests/queries/0_stateless/02497_trace_events_stress_long.sh index 547aa3b89a2..7dc72807c5a 100755 --- a/tests/queries/0_stateless/02497_trace_events_stress_long.sh +++ b/tests/queries/0_stateless/02497_trace_events_stress_long.sh @@ -9,9 +9,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) function thread1() { - query_id="$RANDOM-$CLICKHOUSE_DATABASE" - + thread_id=$1 while true; do + query_id="02497_$CLICKHOUSE_DATABASE-$RANDOM-$thread_id" $CLICKHOUSE_CLIENT --query_id=$query_id --query " SELECT count() FROM numbers_mt(100000) SETTINGS trace_profile_events = 1, @@ -35,13 +35,13 @@ export -f thread2 TIMEOUT=10 -timeout $TIMEOUT bash -c thread1 >/dev/null & -timeout $TIMEOUT bash -c thread1 >/dev/null & -timeout $TIMEOUT bash -c thread1 >/dev/null & -timeout $TIMEOUT bash -c thread1 >/dev/null & +timeout $TIMEOUT bash -c "thread1 0" >/dev/null & +timeout $TIMEOUT bash -c "thread1 1" >/dev/null & +timeout $TIMEOUT bash -c "thread1 2" >/dev/null & +timeout $TIMEOUT bash -c "thread1 3" >/dev/null & timeout $TIMEOUT bash -c thread2 >/dev/null & wait -$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE query_id = '$query_id' SYNC" -$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id = '$query_id'" +$CLICKHOUSE_CLIENT -q "KILL QUERY WHERE query_id LIKE '02497_$CLICKHOUSE_DATABASE%' SYNC" >/dev/null +$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id LIKE '02497_$CLICKHOUSE_DATABASE%'"