From 4f1d6c1ffe337e258f28a0a1648016e4481c2f37 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Wed, 26 May 2021 02:04:16 +0300 Subject: [PATCH] Fix the annoying test --- .../01085_max_distributed_connections_http.reference | 2 -- .../01085_max_distributed_connections_http.sh | 12 +++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.reference b/tests/queries/0_stateless/01085_max_distributed_connections_http.reference index aa47d0d46d4..e69de29bb2d 100644 --- a/tests/queries/0_stateless/01085_max_distributed_connections_http.reference +++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.reference @@ -1,2 +0,0 @@ -0 -0 diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh index d7eb75e717a..1aa9939407c 100755 --- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh +++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh @@ -4,6 +4,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh . "$CURDIR"/../shell_config.sh -query="SELECT sleepEachRow(1) FROM remote('127.{2,3}', system.one)" -# 1.8 less then 2 seconds, but long enough to cover possible load peaks -timeout 1.8s ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&max_distributed_connections=2&max_threads=1" -d "$query" +# Sometimes 1.8 seconds are not enough due to system overload. +# But if it can run in less than five seconds at least sometimes - it is enough for the test. + +while true +do + query="SELECT sleepEachRow(1) FROM remote('127.{2,3}', system.one) FORMAT Null" + # 1.8 less then 2 seconds, but long enough to cover possible load peaks + timeout 1.8s ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&max_distributed_connections=2&max_threads=1" -d "$query" && break +done