Skip to content

Commit f05d21e

Browse files
ivanmorozov333blinkov
authored andcommitted
additional deadline checkers and info (#15239)
1 parent 8bc3161 commit f05d21e

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

ydb/core/tx/columnshard/engines/reader/actor/actor.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ void TColumnShardScan::HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/) {
153153
<< " txId: " << TxId << " scanId: " << ScanId << " gen: " << ScanGen << " tablet: " << TabletId);
154154

155155
if (TMonotonic::Now() >= GetDeadline()) {
156-
SendScanError("ColumnShard scanner timeout: HAS_ACK=" + ::ToString(!!AckReceivedInstant));
157-
Finish(NColumnShard::TScanCounters::EStatusFinish::Deadline);
156+
CheckHanging(true);
157+
LastResultInstant = TMonotonic::Now();
158+
// SendScanError("ColumnShard scanner timeout: HAS_ACK=" + ::ToString(!!AckReceivedInstant));
159+
// Finish(NColumnShard::TScanCounters::EStatusFinish::Deadline);
158160
} else {
159161
ScheduleWakeup(GetDeadline());
160162
}
@@ -284,6 +286,16 @@ void TColumnShardScan::ContinueProcessing() {
284286
}
285287
}
286288
}
289+
CheckHanging();
290+
}
291+
292+
void TColumnShardScan::CheckHanging(const bool logging) const {
293+
if (logging) {
294+
AFL_WARN(NKikimrServices::TX_COLUMNSHARD)("HAS_ACK", AckReceivedInstant)("fi", FinishInstant)("si", !!ScanIterator)(
295+
"has_more", ChunksLimiter.HasMore())("in_waiting", ScanCountersPool.InWaiting())("counters_waiting", ScanCountersPool.DebugString())(
296+
"scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)("gen", ScanGen)("tablet", TabletId)(
297+
"debug", ScanIterator ? ScanIterator->DebugString() : Default<TString>())("last", LastResultInstant);
298+
}
287299
AFL_VERIFY(!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore() || ScanCountersPool.InWaiting())("scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)(
288300
"gen", ScanGen)("tablet", TabletId)("debug", ScanIterator->DebugString())(
289301
"counters", ScanCountersPool.DebugString());

ydb/core/tx/columnshard/engines/reader/actor/actor.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class TColumnShardScan: public TActorBootstrapped<TColumnShardScan>,
4747
private:
4848
STATEFN(StateScan) {
4949
auto g = Stats->MakeGuard("processing");
50-
TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD_SCAN) ("SelfId", SelfId())(
51-
"TabletId", TabletId)("ScanId", ScanId)("TxId", TxId)("ScanGen", ScanGen)("task_identifier", ReadMetadataRange->GetScanIdentifier()));
50+
TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD_SCAN) ("SelfId", SelfId())("TabletId",
51+
TabletId)("ScanId", ScanId)("TxId", TxId)("ScanGen", ScanGen)("task_identifier", ReadMetadataRange->GetScanIdentifier()));
5252
switch (ev->GetTypeRewrite()) {
5353
hFunc(NKqp::TEvKqpCompute::TEvScanDataAck, HandleScan);
5454
hFunc(NKqp::TEvKqp::TEvAbortExecution, HandleScan);
@@ -78,6 +78,7 @@ class TColumnShardScan: public TActorBootstrapped<TColumnShardScan>,
7878
void HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/);
7979

8080
private:
81+
void CheckHanging(const bool logging = false) const;
8182
void MakeResult(size_t reserveRows = 0);
8283

8384
void AddRow(const TConstArrayRef<TCell>& row) override;

0 commit comments

Comments
 (0)