Skip to content

Do not call TaskRunner for periodic stats updates #18143

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
merged 1 commit into from
May 8, 2025
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
10 changes: 2 additions & 8 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1133,15 +1133,9 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
break;
}
case EEvWakeupTag::PeriodicStatsTag: {
const auto maxInterval = RuntimeSettings.ReportStatsSettings->MaxInterval;
if (Running && State == NDqProto::COMPUTE_STATE_EXECUTING) {
if (ProcessOutputsState.LastRunStatus == ERunStatus::Finished) {
// wait until all outputs are drained
ReportStats();
} else {
DoExecute();
}
this->Schedule(maxInterval, new NActors::TEvents::TEvWakeup(EEvWakeupTag::PeriodicStatsTag));
ReportStats();
this->Schedule(RuntimeSettings.ReportStatsSettings->MaxInterval, new NActors::TEvents::TEvWakeup(EEvWakeupTag::PeriodicStatsTag));
}
break;
}
Expand Down
10 changes: 8 additions & 2 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_stats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ void FillTaskRunnerStats(ui64 taskId, ui32 stageId, const TDqTaskRunnerStats& ta

protoTask->SetWaitInputTimeUs(taskStats.WaitInputTime.MicroSeconds());
protoTask->SetWaitOutputTimeUs(taskStats.WaitOutputTime.MicroSeconds());
protoTask->SetCurrentWaitInputTimeUs(taskStats.CurrentWaitInputTime.MicroSeconds());
protoTask->SetCurrentWaitOutputTimeUs(taskStats.CurrentWaitOutputTime.MicroSeconds());

auto now = TInstant::Now();
if (taskStats.CurrentWaitInputStartTime) {
protoTask->SetCurrentWaitInputTimeUs((now - taskStats.CurrentWaitInputStartTime).MicroSeconds());
}
if (taskStats.CurrentWaitOutputStartTime) {
protoTask->SetCurrentWaitOutputTimeUs((now - taskStats.CurrentWaitOutputStartTime).MicroSeconds());
}

if (StatsLevelCollectFull(level)) {
protoTask->SetSpillingComputeWriteBytes(taskStats.SpillingComputeWriteBytes);
Expand Down
23 changes: 13 additions & 10 deletions ydb/library/yql/dq/runtime/dq_tasks_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -786,27 +786,34 @@ class TDqTaskRunner : public IDqTaskRunner {
}

if (Y_LIKELY(CollectBasic())) {
auto now = TInstant::Now();
switch (runStatus) {
case ERunStatus::Finished:
// finished => waiting for nothing
Stats->CurrentWaitInputTime = TDuration::Zero();
Stats->CurrentWaitOutputTime = TDuration::Zero();
Stats->FinishTs = TInstant::Now();
Stats->CurrentWaitInputStartTime = TInstant::Zero();
Stats->CurrentWaitOutputStartTime = TInstant::Zero();
Stats->FinishTs = now;
break;
case ERunStatus::PendingInput:
// output is checked first => not waiting for output
Stats->CurrentWaitOutputTime = TDuration::Zero();
Stats->CurrentWaitOutputStartTime = TInstant::Zero();
if (Y_LIKELY(InputConsumed)) {
// did smth => waiting for nothing
Stats->CurrentWaitInputTime = TDuration::Zero();
Stats->CurrentWaitInputStartTime = TInstant::Zero();
} else {
StartWaitingInput();
if (Y_LIKELY(!Stats->CurrentWaitInputStartTime)) {
Stats->CurrentWaitInputStartTime = now;
}
}
break;
case ERunStatus::PendingOutput:
// waiting for output => not waiting for input
Stats->CurrentWaitInputTime = TDuration::Zero();
Stats->CurrentWaitInputStartTime = TInstant::Zero();
StartWaitingOutput();
if (Y_LIKELY(!Stats->CurrentWaitOutputStartTime)) {
Stats->CurrentWaitOutputStartTime = now;
}
break;
}
}
Expand Down Expand Up @@ -1077,7 +1084,6 @@ class TDqTaskRunner : public IDqTaskRunner {
} else {
Stats->WaitStartTime += delta;
}
Stats->CurrentWaitInputTime += delta;
}
StartWaitInputTime = now;
}
Expand All @@ -1087,7 +1093,6 @@ class TDqTaskRunner : public IDqTaskRunner {
if (Y_LIKELY(StartWaitOutputTime)) {
auto delta = now - *StartWaitOutputTime;
Stats->WaitOutputTime += delta;
Stats->CurrentWaitOutputTime += delta;
}
StartWaitOutputTime = now;
}
Expand All @@ -1101,14 +1106,12 @@ class TDqTaskRunner : public IDqTaskRunner {
} else {
Stats->WaitStartTime += delta;
}
Stats->CurrentWaitInputTime += delta;
StartWaitInputTime.reset();
TDuration::Zero();
}
if (StartWaitOutputTime) {
auto delta = now - *StartWaitOutputTime;
Stats->WaitOutputTime += delta;
Stats->CurrentWaitOutputTime += delta;
StartWaitOutputTime.reset();
}
}
Expand Down
5 changes: 3 additions & 2 deletions ydb/library/yql/dq/runtime/dq_tasks_runner.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ struct TDqTaskRunnerStats {
TDuration WaitStartTime;
TDuration WaitInputTime;
TDuration WaitOutputTime;
TDuration CurrentWaitInputTime;
TDuration CurrentWaitOutputTime;

TInstant CurrentWaitInputStartTime;
TInstant CurrentWaitOutputStartTime;

ui64 SpillingComputeWriteBytes;
ui64 SpillingChannelWriteBytes;
Expand Down
Loading