From 8abb85948c4b401a61cdf6dc6cf33b7ac9df2279 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:03:11 +0000
Subject: [PATCH 1/2] Fix flaky test and add separate to show unexpected
 behaviour

---
 .../01603_insert_select_too_many_parts.sql       |  3 ++-
 ...t_select_too_many_parts_multithread.reference |  1 +
 ..._insert_select_too_many_parts_multithread.sql | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference
 create mode 100644 tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql

diff --git a/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql b/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
index a56b680e212..eea52282cf4 100644
--- a/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
+++ b/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
@@ -5,7 +5,8 @@ SYSTEM STOP MERGES too_many_parts;
 SET max_block_size = 1, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
 
 -- exception is not thrown if threshold is exceeded when multi-block INSERT is already started.
-INSERT INTO too_many_parts SELECT * FROM numbers(10);
+-- Single thread is used as different threads check it separately https://github.com/ClickHouse/ClickHouse/issues/61158
+INSERT INTO too_many_parts SELECT * FROM numbers(10) SETTINGS max_insert_threads=1;
 SELECT count() FROM too_many_parts;
 
 -- exception is thrown if threshold is exceeded on new INSERT.
diff --git a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference
new file mode 100644
index 00000000000..29d6383b52c
--- /dev/null
+++ b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference
@@ -0,0 +1 @@
+100
diff --git a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
new file mode 100644
index 00000000000..00cf262add5
--- /dev/null
+++ b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
@@ -0,0 +1,16 @@
+# Tags: disabled
+# TODO: Fix parts_to_throw_insert logic for parallel  MergeTreeSink onStart calls
+DROP TABLE IF EXISTS too_many_parts;
+
+CREATE TABLE too_many_parts (x UInt64) ENGINE = MergeTree ORDER BY tuple() SETTINGS parts_to_delay_insert = 5, parts_to_throw_insert = 5;
+
+SYSTEM STOP MERGES too_many_parts;
+SET max_block_size = 1, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0, max_threads=100, max_insert_threads=100;
+
+-- exception is not thrown if threshold is exceeded when multi-block INSERT is already started.
+INSERT INTO too_many_parts SELECT * FROM numbers_mt(100);
+SELECT count() FROM too_many_parts;
+
+INSERT INTO too_many_parts SELECT * FROM numbers_mt(10); --  { serverError 252 }
+
+DROP TABLE too_many_parts;

From c0bfafa203091abbe2f5af6d1253249fc432ad64 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:48:02 +0000
Subject: [PATCH 2/2] fix tags

---
 .../02997_insert_select_too_many_parts_multithread.sql        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
index 00cf262add5..2dfc8094115 100644
--- a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
+++ b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
@@ -1,5 +1,5 @@
-# Tags: disabled
-# TODO: Fix parts_to_throw_insert logic for parallel  MergeTreeSink onStart calls
+--  Tags: disabled
+-- TODO: Fix parts_to_throw_insert logic for parallel  MergeTreeSink onStart calls
 DROP TABLE IF EXISTS too_many_parts;
 
 CREATE TABLE too_many_parts (x UInt64) ENGINE = MergeTree ORDER BY tuple() SETTINGS parts_to_delay_insert = 5, parts_to_throw_insert = 5;