Skip to content

Revert "additional deadline checkers and info" #15374

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
Mar 5, 2025
Merged

Revert "additional deadline checkers and info" #15374

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
16 changes: 2 additions & 14 deletions ydb/core/tx/columnshard/engines/reader/actor/actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,8 @@ void TColumnShardScan::HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/) {
<< " txId: " << TxId << " scanId: " << ScanId << " gen: " << ScanGen << " tablet: " << TabletId);

if (TMonotonic::Now() >= GetDeadline()) {
CheckHanging(true);
LastResultInstant = TMonotonic::Now();
// SendScanError("ColumnShard scanner timeout: HAS_ACK=" + ::ToString(!!AckReceivedInstant));
// Finish(NColumnShard::TScanCounters::EStatusFinish::Deadline);
SendScanError("ColumnShard scanner timeout: HAS_ACK=" + ::ToString(!!AckReceivedInstant));
Finish(NColumnShard::TScanCounters::EStatusFinish::Deadline);
} else {
ScheduleWakeup(GetDeadline());
}
Expand Down Expand Up @@ -286,16 +284,6 @@ void TColumnShardScan::ContinueProcessing() {
}
}
}
CheckHanging();
}

void TColumnShardScan::CheckHanging(const bool logging) const {
if (logging) {
AFL_WARN(NKikimrServices::TX_COLUMNSHARD)("HAS_ACK", AckReceivedInstant)("fi", FinishInstant)("si", !!ScanIterator)(
"has_more", ChunksLimiter.HasMore())("in_waiting", ScanCountersPool.InWaiting())("counters_waiting", ScanCountersPool.DebugString())(
"scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)("gen", ScanGen)("tablet", TabletId)(
"debug", ScanIterator ? ScanIterator->DebugString() : Default<TString>())("last", LastResultInstant);
}
AFL_VERIFY(!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore() || ScanCountersPool.InWaiting())("scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)(
"gen", ScanGen)("tablet", TabletId)("debug", ScanIterator->DebugString())(
"counters", ScanCountersPool.DebugString());
Expand Down
5 changes: 2 additions & 3 deletions ydb/core/tx/columnshard/engines/reader/actor/actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class TColumnShardScan: public TActorBootstrapped<TColumnShardScan>,
private:
STATEFN(StateScan) {
auto g = Stats->MakeGuard("processing");
TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD_SCAN) ("SelfId", SelfId())("TabletId",
TabletId)("ScanId", ScanId)("TxId", TxId)("ScanGen", ScanGen)("task_identifier", ReadMetadataRange->GetScanIdentifier()));
TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD_SCAN) ("SelfId", SelfId())(
"TabletId", TabletId)("ScanId", ScanId)("TxId", TxId)("ScanGen", ScanGen)("task_identifier", ReadMetadataRange->GetScanIdentifier()));
switch (ev->GetTypeRewrite()) {
hFunc(NKqp::TEvKqpCompute::TEvScanDataAck, HandleScan);
hFunc(NKqp::TEvKqp::TEvAbortExecution, HandleScan);
Expand Down Expand Up @@ -78,7 +78,6 @@ class TColumnShardScan: public TActorBootstrapped<TColumnShardScan>,
void HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/);

private:
void CheckHanging(const bool logging = false) const;
void MakeResult(size_t reserveRows = 0);

void AddRow(const TConstArrayRef<TCell>& row) override;
Expand Down
Loading