Skip to content

Backport busy spin fix to 1.5.2 #668

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

Merged
staticlibs merged 1 commit into from
Apr 20, 2026
+10 −6
Merged

Backport busy spin fix to 1.5.2 #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/duckdb/src/parallel/task_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include "duckdb/parallel/task_notifier.hpp"
#include "duckdb/parallel/task_scheduler.hpp"

#include <thread>

namespace duckdb {

TaskExecutor::TaskExecutor(TaskScheduler &scheduler)
Expand Down Expand Up @@ -38,14 +40,16 @@ void TaskExecutor::FinishTask() {
void TaskExecutor::WorkOnTasks() {
// repeatedly execute tasks until we are finished
shared_ptr<Task> task_from_producer;
while (scheduler.GetTaskFromProducer(*token, task_from_producer)) {
auto res = task_from_producer->Execute(TaskExecutionMode::PROCESS_ALL);
(void)res;
D_ASSERT(res != TaskExecutionResult::TASK_BLOCKED);
task_from_producer.reset();
}
// wait for all active tasks to finish
while (completed_tasks != total_tasks) {
if (scheduler.GetTaskFromProducer(*token, task_from_producer)) {
const auto res = task_from_producer->Execute(TaskExecutionMode::PROCESS_ALL);
std::ignore = res;
D_ASSERT(res != TaskExecutionResult::TASK_BLOCKED);
task_from_producer.reset();
} else {
std::this_thread::yield();
}
}

// check if we ran into any errors while checkpointing
Expand Down
Loading