@@ -153,10 +153,8 @@ void TColumnShardScan::HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/) {
153
153
<< " txId: " << TxId << " scanId: " << ScanId << " gen: " << ScanGen << " tablet: " << TabletId);
154
154
155
155
if (TMonotonic::Now () >= GetDeadline ()) {
156
- CheckHanging (true );
157
- LastResultInstant = TMonotonic::Now ();
158
- // SendScanError("ColumnShard scanner timeout: HAS_ACK=" + ::ToString(!!AckReceivedInstant));
159
- // Finish(NColumnShard::TScanCounters::EStatusFinish::Deadline);
156
+ SendScanError (" ColumnShard scanner timeout: HAS_ACK=" + ::ToString (!!AckReceivedInstant));
157
+ Finish (NColumnShard::TScanCounters::EStatusFinish::Deadline);
160
158
} else {
161
159
ScheduleWakeup (GetDeadline ());
162
160
}
@@ -286,16 +284,6 @@ void TColumnShardScan::ContinueProcessing() {
286
284
}
287
285
}
288
286
}
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
- }
299
287
AFL_VERIFY (!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore () || ScanCountersPool.InWaiting ())(" scan_actor_id" , ScanActorId)(" tx_id" , TxId)(" scan_id" , ScanId)(
300
288
" gen" , ScanGen)(" tablet" , TabletId)(" debug" , ScanIterator->DebugString ())(
301
289
" counters" , ScanCountersPool.DebugString ());
0 commit comments