Skip to content

fix SendChannelData(): requirement !outputChannel.RetryState in async CA #15338

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 4 commits into from
Mar 10, 2025
Merged

fix SendChannelData(): requirement !outputChannel.RetryState in async CA #15338

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db3d86f
fix SendChannelData(): requirement !outputChannel.RetryState in async CA
yumkam Mar 4, 2025
aaa6da8
fix build error
yumkam Mar 4, 2025
ae7d808
Refine comments
yumkam Mar 5, 2025
39f926e
reduce Inflight and reset PopStarted when skipping send
yumkam Mar 5, 2025
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
9 changes: 9 additions & 0 deletions ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,15 @@ class TDqAsyncComputeActor : public TDqComputeActorBase<TDqAsyncComputeActor, TC
auto it = OutputChannelsMap.find(ev->Get()->ChannelId);
Y_ABORT_UNLESS(it != OutputChannelsMap.end());
TOutputChannelInfo& outputChannel = it->second;
// This condition was already checked in ProcessOutputsImpl, but since then
// RetryState could've been changed. Recheck it once again:
if (!Channels->ShouldSkipData(outputChannel.ChannelId) && !Channels->CanSendChannelData(outputChannel.ChannelId)) {
// Once RetryState will be reset, channel will trigger either ResumeExecution or PeerFinished; either way execution will re-reach this function
CA_LOG_D("OnOutputChannelData return because Channel can't send channel data, channel: " << outputChannel.ChannelId);
outputChannel.PopStarted = false;
ProcessOutputsState.Inflight--;
return;
}
if (outputChannel.AsyncData) {
CA_LOG_E("Data was not sent to the output channel in the previous step. Channel: " << outputChannel.ChannelId
<< " Finished: " << outputChannel.Finished
Expand Down
Loading