Skip to content

Fix busywait on adding to full async input buffer (backport 24-4 #14522) #15583

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,20 @@ class TDqAsyncComputeActor : public TDqComputeActorBase<TDqAsyncComputeActor, TC
}

void DoExecuteImpl() override {
PollAsyncInput();
LastPollResult = PollAsyncInput();

if (LastPollResult && *LastPollResult != EResumeSource::CAPollAsyncNoSpace) {
// When (some) source buffers was not full, and (some) was successfully polled,
// initiate next DoExecute run immediately;
// If only reason for continuing was lack on space on all source
// buffers, only continue execution after run completed,
// (some) sources was consumed and compute waits for input
// (Otherwise we enter busy-poll, and there are especially bad scenario
// when compute is delayed by rate-limiter, we enter busy-poll here,
// this spends cpu, ratelimiter delays compute execution even more))
ContinueExecute(*std::exchange(LastPollResult, {}));
}

if (ProcessSourcesState.Inflight == 0) {
auto req = GetCheckpointRequest();
CA_LOG_T("DoExecuteImpl: " << (bool) req);
Expand Down Expand Up @@ -1087,6 +1100,9 @@ class TDqAsyncComputeActor : public TDqComputeActorBase<TDqAsyncComputeActor, TC
CA_LOG_T("AsyncCheckRunStatus: TakeInputChannelDataRequests: " << TakeInputChannelDataRequests.size());
return;
}
if (ProcessOutputsState.LastRunStatus == ERunStatus::PendingInput && LastPollResult) {
ContinueExecute(*LastPollResult);
}
TBase::CheckRunStatus();
}

Expand Down Expand Up @@ -1134,6 +1150,7 @@ class TDqAsyncComputeActor : public TDqComputeActorBase<TDqAsyncComputeActor, TC
NMonitoring::THistogramPtr CpuTimeQuotaWaitDelay;
NMonitoring::TDynamicCounters::TCounterPtr CpuTime;
NDqProto::TEvComputeActorState ComputeActorState;
TMaybe<EResumeSource> LastPollResult;
};


Expand Down
42 changes: 31 additions & 11 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,14 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
return;
}

if (status == ERunStatus::PendingInput) {
for (auto& [id, inputTransform] : InputTransformsMap) {
if (!inputTransform.Buffer->Empty()) {
ContinueExecute(EResumeSource::CAPendingInput);
}
}
}

if (status != ERunStatus::Finished) {
// If the incoming channel's buffer was full at the moment when last ChannelDataAck event had been sent,
// there will be no attempts to send a new piece of data from the other side of this channel.
Expand Down Expand Up @@ -1389,26 +1397,38 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
}
}

void PollAsyncInput() {
[[nodiscard]]
TMaybe<EResumeSource> PollAsyncInput() {
TMaybe<EResumeSource> pollResult;
if (!Running) {
CA_LOG_T("Skip polling inputs and sources because not running");
return pollResult;
}

CA_LOG_T("Poll inputs");
for (auto& [inputIndex, transform] : InputTransformsMap) {
if (auto resume = transform.PollAsyncInput(MetricsReporter, WatermarksTracker, RuntimeSettings.AsyncInputPushLimit)) {
if (!pollResult || *pollResult == EResumeSource::CAPollAsyncNoSpace) {
pollResult = resume;
}
}
}

// Don't produce any input from sources if we're about to save checkpoint.
if (!Running || (Checkpoints && Checkpoints->HasPendingCheckpoint() && !Checkpoints->ComputeActorStateSaved())) {
if ((Checkpoints && Checkpoints->HasPendingCheckpoint() && !Checkpoints->ComputeActorStateSaved())) {
CA_LOG_T("Skip polling sources because of pending checkpoint");
return;
return pollResult;
}

CA_LOG_T("Poll sources");
for (auto& [inputIndex, source] : SourcesMap) {
if (auto resume = source.PollAsyncInput(MetricsReporter, WatermarksTracker, RuntimeSettings.AsyncInputPushLimit)) {
ContinueExecute(*resume);
}
}

CA_LOG_T("Poll inputs");
for (auto& [inputIndex, transform] : InputTransformsMap) {
if (auto resume = transform.PollAsyncInput(MetricsReporter, WatermarksTracker, RuntimeSettings.AsyncInputPushLimit)) {
ContinueExecute(*resume);
if (!pollResult || *pollResult == EResumeSource::CAPollAsyncNoSpace) {
pollResult = resume;
}
}
}
return pollResult;
}

void OnNewAsyncInputDataArrived(const IDqComputeActorAsyncInput::TEvNewAsyncInputDataArrived::TPtr& ev) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TDqSyncComputeActorBase: public TDqComputeActorBase<TDerived, TComputeActo
void DoExecuteImpl() override{
auto sourcesState = static_cast<TDerived*>(this)->GetSourcesState();

TBase::PollAsyncInput();
auto lastPollResult = TBase::PollAsyncInput();
ERunStatus status = TaskRunner->Run();

CA_LOG_T("Resume execution, run status: " << status);
Expand All @@ -44,6 +44,13 @@ class TDqSyncComputeActorBase: public TDqComputeActorBase<TDerived, TComputeActo
}

TBase::ProcessOutputsImpl(status);

if (lastPollResult && (*lastPollResult != EResumeSource::CAPollAsyncNoSpace || status == ERunStatus::PendingInput)) {
// If only reason for continuing was lack on space on all sources,
// only continue execution when input was consumed;
// otherwise this may result in busy-poll
TBase::ContinueExecute(*lastPollResult);
}
}

void DoTerminateImpl() override {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class TInputTransformStreamLookupBase
}
}
finished = IsFinished();
return 0;
return AwaitingQueue.RowCount();
}

TMaybe<google::protobuf::Any> ExtraData() override {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@ class TLocalTaskRunnerActor
return false;
}
}
for (const auto transformId: InputTransforms) {
const auto t = TaskRunner->GetInputTransform(transformId);
if (t) {
auto [_, transform] = *t;
if (!transform->Empty()) {
return false;
}
if (transform->IsPending()) {
return false;
}
}
}
return true;
}

Expand Down Expand Up @@ -443,6 +455,7 @@ class TLocalTaskRunnerActor
for (auto i = 0; i != inputs.size(); ++i) {
if (auto t = TaskRunner->GetInputTransform(i)) {
inputTransforms[i] = *t;
InputTransforms.emplace(i);
}
}

Expand Down Expand Up @@ -490,6 +503,7 @@ class TLocalTaskRunnerActor
const TTxId TxId;
const ui64 TaskId;
THashSet<ui32> Inputs;
THashSet<ui32> InputTransforms;
THashSet<ui32> Sources;
TIntrusivePtr<NDq::IDqTaskRunner> TaskRunner;
THashSet<ui32> InputChannelsWithDisabledCheckpoints;
Expand Down
7 changes: 6 additions & 1 deletion ydb/library/yql/dq/runtime/dq_async_input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace NYql::NDq {
class TDqAsyncInputBuffer : public TDqInputImpl<TDqAsyncInputBuffer, IDqAsyncInputBuffer> {
using TBaseImpl = TDqInputImpl<TDqAsyncInputBuffer, IDqAsyncInputBuffer>;
friend TBaseImpl;
bool Pending = false;
public:
TDqAsyncInputBufferStats PushStats;
TDqInputStats PopStats;
Expand All @@ -32,7 +33,7 @@ class TDqAsyncInputBuffer : public TDqInputImpl<TDqAsyncInputBuffer, IDqAsyncInp
}

void Push(NKikimr::NMiniKQL::TUnboxedValueBatch&& batch, i64 space) override {
Y_ABORT_UNLESS(!batch.empty() || !space);
Pending = space != 0;
if (!batch.empty()) {
AddBatch(std::move(batch), space);
}
Expand All @@ -41,6 +42,10 @@ class TDqAsyncInputBuffer : public TDqInputImpl<TDqAsyncInputBuffer, IDqAsyncInp
virtual void Push(TDqSerializedBatch&&, i64) override {
YQL_ENSURE(!"Unimplemented");
}

bool IsPending() const override {
return Pending;
}
};

IDqAsyncInputBuffer::TPtr CreateDqAsyncInputBuffer(
Expand Down
2 changes: 2 additions & 0 deletions ydb/library/yql/dq/runtime/dq_async_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class IDqAsyncInputBuffer : public IDqInput {
virtual void Push(TDqSerializedBatch&& batch, i64 space) = 0;

virtual void Finish() = 0;

virtual bool IsPending() const { return false; };
};

IDqAsyncInputBuffer::TPtr CreateDqAsyncInputBuffer(ui64 inputIndex, const TString& type, NKikimr::NMiniKQL::TType* inputType, ui64 maxBufferBytes,
Expand Down
Loading