Skip to content

[Stable-25-2] Make spilling wakeup callback thread safe #24394

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
merged 1 commit into from
Sep 8, 2025
+10 −3
Merged

[Stable-25-2] Make spilling wakeup callback thread safe #24394

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,12 @@ void TKqpScanComputeActor::DoBootstrap() {
auto taskRunner = MakeDqTaskRunner(GetAllocatorPtr(), execCtx, settings, logger);
TBase::SetTaskRunner(taskRunner);

auto wakeup = [this] { ContinueExecute(); };
auto selfId = this->SelfId();
auto wakeupCallback = [actorSystem, selfId]() {
actorSystem->Send(selfId, new TEvDqCompute::TEvResumeExecution{EResumeSource::CAWakeupCallback});
};
auto errorCallback = [this](const TString& error){ SendError(error); };
TBase::PrepareTaskRunner(TKqpTaskRunnerExecutionContext(std::get<ui64>(TxId), RuntimeSettings.UseSpilling, MemoryLimits.ArrayBufferMinFillPercentage, std::move(wakeup), std::move(errorCallback)));
TBase::PrepareTaskRunner(TKqpTaskRunnerExecutionContext(std::get<ui64>(TxId), RuntimeSettings.UseSpilling, MemoryLimits.ArrayBufferMinFillPercentage, std::move(wakeupCallback), std::move(errorCallback)));

ComputeCtx.AddTableScan(0, Meta, GetStatsMode());
ScanData = &ComputeCtx.GetTableScan(0);
Expand Down
5 changes: 4 additions & 1 deletion ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ class TDqComputeActor : public TDqSyncComputeActorBase<TDqComputeActor> {

auto taskRunner = TaskRunnerFactory(GetAllocatorPtr(), Task, RuntimeSettings.StatsMode, logger);
SetTaskRunner(taskRunner);
auto wakeupCallback = [this]{ ContinueExecute(EResumeSource::CABootstrapWakeup); };
auto selfId = this->SelfId();
auto wakeupCallback = [actorSystem, selfId]() {
actorSystem->Send(selfId, new TEvDqCompute::TEvResumeExecution{EResumeSource::CAWakeupCallback});
};
auto errorCallback = [this](const TString& error){ SendError(error); };
TDqTaskRunnerExecutionContext execCtx(TxId, std::move(wakeupCallback), std::move(errorCallback));
PrepareTaskRunner(execCtx);
Expand Down
1 change: 1 addition & 0 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ enum class EResumeSource : ui32 {
CADataSent,
CAPendingOutput,
CATaskRunnerCreated,
CAWakeupCallback,

Last,
};
Expand Down
Loading