Merge pull request #61338 from ClickHouse/backport/23.12/60499

Backport #60499 to 23.12: Cancel PipelineExecutor properly in case of exception in spawnThreads
ClickHouse · Mar 14, 2024 · 635e48b · 635e48b
2 parents d276f88 + 69e8829
commit 635e48b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
@@ -391,7 +391,9 @@ void PipelineExecutor::executeImpl(size_t num_threads, bool concurrency_control)
     SCOPE_EXIT_SAFE(
         if (!finished_flag)
         {
-            finish();
+            /// If finished_flag is not set, there was an exception.
+            /// Cancel execution in this case.
+            cancel();
             if (pool)
                 pool->wait();
         }