Merge pull request #30284 from Algunenano/sequential_tests

nikitamikhaylov · web-flow · commit 75c16b8f8924 · 2021-10-18T22:42:14.000+03:00
Adjust resource heavy tests
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
@@ -1,10 +1,6 @@
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-NUM_REPLICAS=10
+NUM_REPLICAS=6
 
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
@@ -20,17 +20,17 @@ done
 function thread {
     i=0 retries=300
     while [[ $i -lt $retries ]]; do # server can be dead
-        $CLICKHOUSE_CLIENT --insert_quorum 5 --insert_quorum_parallel 1 --query "INSERT INTO r$1 SELECT $2" && break
+        $CLICKHOUSE_CLIENT --insert_quorum 3 --insert_quorum_parallel 1 --query "INSERT INTO r$1 SELECT $2" && break
         ((++i))
         sleep 0.1
     done
 }
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    for j in {0..9}; do
+    for j in {0..4}; do
         a=$((($i - 1) * 10 + $j))
 
-        # Note: making 100 connections simultaneously is a mini-DoS when server is build with sanitizers and CI environment is overloaded.
+        # Note: making 30 connections simultaneously is a mini-DoS when server is build with sanitizers and CI environment is overloaded.
         # That's why we repeat "socket timeout" errors.
         thread $i $a 2>&1 | grep -v -P 'SOCKET_TIMEOUT|NETWORK_ERROR|^$' &
     done
@@ -46,5 +46,5 @@ for i in $(seq 1 $NUM_REPLICAS); do
 done
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS r$i;"
+    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS r$i SYNC;"
 done
diff --git a/tests/queries/0_stateless/02033_join_engine_deadlock_long.sh b/tests/queries/0_stateless/02033_join_engine_deadlock_long.sh
@@ -29,7 +29,7 @@ populate_table_bg () {
         $CLICKHOUSE_CLIENT --query "
             INSERT INTO join_block_test
             SELECT toString(number) as id, number * number as num
-            FROM system.numbers LIMIT 3000000
+            FROM system.numbers LIMIT 500000
         " >/dev/null
     ) &
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ populate_table_bg () {`
`29`	`29`	`$CLICKHOUSE_CLIENT --query "`
`30`	`30`	`INSERT INTO join_block_test`
`31`	`31`	`SELECT toString(number) as id, number * number as num`
`32`		`- FROM system.numbers LIMIT 3000000`
	`32`	`+ FROM system.numbers LIMIT 500000`
`33`	`33`	`" >/dev/null`
`34`	`34`	`) &`
`35`	`35`	`}`