@@ -84,7 +84,7 @@ void TKqpScanFetcherActor::Bootstrap() {
84
84
}
85
85
86
86
void TKqpScanFetcherActor::HandleExecute (TEvScanExchange::TEvAckData::TPtr& ev) {
87
- Y_ABORT_UNLESS (ev->Get ()->GetFreeSpace ());
87
+ AFL_ENSURE (ev->Get ()->GetFreeSpace ());
88
88
AFL_DEBUG (NKikimrServices::KQP_COMPUTE)(" event" , " AckDataFromCompute" )(" self_id" , SelfId ())(" scan_id" , ScanId)
89
89
(" packs_to_send" , InFlightComputes.GetPacksToSendCount ())
90
90
(" from" , ev->Sender )(" shards remain" , PendingShards.size ())
@@ -237,7 +237,7 @@ void TKqpScanFetcherActor::HandleExecute(TEvTxProxySchemeCache::TEvResolveKeySet
237
237
PendingResolveShards.pop_front ();
238
238
ResolveNextShard ();
239
239
240
- Y_ABORT_UNLESS (!InFlightShards.GetShardScanner (state.TabletId ));
240
+ AFL_ENSURE (!InFlightShards.GetShardScanner (state.TabletId ));
241
241
242
242
AFL_ENSURE (state.State == EShardState::Resolving);
243
243
CA_LOG_D (" Received TEvResolveKeySetResult update for table '" << ScanDataMeta.TablePath << " '" );
@@ -364,13 +364,19 @@ void TKqpScanFetcherActor::HandleExecute(TEvents::TEvUndelivered::TPtr& ev) {
364
364
case TEvDataShard::TEvKqpScan::EventType:
365
365
// Handled by TEvPipeCache::TEvDeliveryProblem event.
366
366
return ;
367
- case TEvKqpCompute::TEvScanDataAck::EventType:
368
- if (!!InFlightShards.GetShardScanner (ev->Cookie )) {
369
- SendGlobalFail (NDqProto::StatusIds::UNAVAILABLE, TIssuesIds::DEFAULT_ERROR, " Delivery problem: EvScanDataAck lost." );
367
+ case TEvKqpCompute::TEvScanDataAck::EventType: {
368
+ auto info = InFlightShards.GetShardScanner (ev->Cookie );
369
+ if (!!info) {
370
+ TStringBuilder builder;
371
+ builder << " Delivery problem: EvScanDataAck lost, NodeId: "
372
+ << SelfId ().NodeId () << " , Details: " << info->ToString () << " ." ;
373
+
374
+ SendGlobalFail (NDqProto::StatusIds::UNAVAILABLE, TIssuesIds::DEFAULT_ERROR, TString (builder));
370
375
}
371
376
return ;
377
+ }
372
378
}
373
- Y_ABORT ( " UNEXPECTED EVENT TYPE " );
379
+ AFL_ENSURE ( " Unexpected event type " )( " source_type " , ev-> Get ()-> SourceType );
374
380
}
375
381
376
382
void TKqpScanFetcherActor::HandleExecute (TEvInterconnect::TEvNodeDisconnected::TPtr& ev) {
0 commit comments