Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cancel PipelineExecutor properly in case of exception in spawnThreads #60499

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Cancel PipelineExecutor properly in case of exception in spawnThreads #60499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f86213e
Cancel PipelineExecutor properly in case of exception in spawnThreads
Avogar Feb 28, 2024
0c902f8
Fix style
Avogar Feb 28, 2024
1b8ae25
Use cancel instead of finish in case of exception
Avogar Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Processors/Executors/PipelineExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear if there was any reason to call only finish() here. The more I read code around, the more questions I have regarding the contracts. In general, looks ok but can't say anything in particular from my current understanding 😕

if (pool)
pool->wait();
}
Expand Down