Merge pull request ClickHouse#65586 from ClickHouse/improve-flaky-test

Improve flaky test to provide more diagnostics
bigo-sg · Jun 24, 2024 · 0c6afe7 · 0c6afe7
2 parents 2ea1796 + b79d3d5
commit 0c6afe7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.reference b/tests/queries/0_stateless/02210_processors_profile_log.reference
@@ -1,38 +1,8 @@
--- { echo }
-EXPLAIN PIPELINE SELECT sleep(1);
 (Expression)
 ExpressionTransform
   (ReadFromStorage)
   SourceFromSingleChunk 0 → 1
-SELECT sleep(1) SETTINGS log_processors_profiles=true, log_queries=1, log_queries_min_type='QUERY_FINISH';
 0
-SYSTEM FLUSH LOGS;
-WITH
-    (
-        SELECT query_id
-        FROM system.query_log
-        WHERE current_database = currentDatabase() AND Settings['log_processors_profiles']='1'
-    ) AS query_id_
-SELECT
-    name,
-    multiIf(
-        -- ExpressionTransform executes sleep(),
-        -- so IProcessor::work() will spend 1 sec.
-        name = 'ExpressionTransform', elapsed_us>=1e6,
-        -- SourceFromSingleChunk, that feed data to ExpressionTransform,
-        -- will feed first block and then wait in PortFull.
-        name = 'SourceFromSingleChunk', output_wait_elapsed_us>=1e6,
-        -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
-        -- so they cannot starts to execute before sleep(1) will be executed.
-        input_wait_elapsed_us>=1e6)
-    elapsed,
-    input_rows,
-    input_bytes,
-    output_rows,
-    output_bytes
-FROM system.processors_profile_log
-WHERE query_id = query_id_
-ORDER BY name;
 ExpressionTransform	1	1	1	1	1
 LazyOutputFormat	1	1	1	0	0
 LimitsCheckingTransform	1	1	1	1	1

diff --git a/tests/queries/0_stateless/02210_processors_profile_log.sql b/tests/queries/0_stateless/02210_processors_profile_log.sql
@@ -1,4 +1,3 @@
--- { echo }
 EXPLAIN PIPELINE SELECT sleep(1);
 
 SELECT sleep(1) SETTINGS log_processors_profiles=true, log_queries=1, log_queries_min_type='QUERY_FINISH';
@@ -15,13 +14,13 @@ SELECT
     multiIf(
         -- ExpressionTransform executes sleep(),
         -- so IProcessor::work() will spend 1 sec.
-        name = 'ExpressionTransform', elapsed_us>=1e6,
+        name = 'ExpressionTransform', elapsed_us>=1e6 ? 1 : elapsed_us,
         -- SourceFromSingleChunk, that feed data to ExpressionTransform,
         -- will feed first block and then wait in PortFull.
-        name = 'SourceFromSingleChunk', output_wait_elapsed_us>=1e6,
+        name = 'SourceFromSingleChunk', output_wait_elapsed_us>=1e6 ? 1 : output_wait_elapsed_us,
         -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
         -- so they cannot starts to execute before sleep(1) will be executed.
-        input_wait_elapsed_us>=1e6)
+        input_wait_elapsed_us>=1e6 ? 1 : input_wait_elapsed_us)
     elapsed,
     input_rows,
     input_bytes,