Skip to content

Commit a9bbb6d

Browse files
authored
disable VERIFY CheckHanging in release build (#19510) (#19802)
2 parents f433b7e + 89d5a52 commit a9bbb6d

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

ydb/core/tx/columnshard/counters/scan.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ TScanCounters::TScanCounters(const TString& module)
3030
, RecordsDeniedByIndex(TBase::GetDeriviative("Indexes/Denied/Records"))
3131
, RecordsAcceptedByHeader(TBase::GetDeriviative("Headers/Accepted/Records"))
3232
, RecordsDeniedByHeader(TBase::GetDeriviative("Headers/Denied/Records"))
33+
, HangingRequests(TBase::GetDeriviative("HangingRequests"))
3334

3435
, PortionBytes(TBase::GetDeriviative("PortionBytes"))
3536
, FilterBytes(TBase::GetDeriviative("FilterBytes"))

ydb/core/tx/columnshard/counters/scan.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ class TScanCounters: public TCommonCountersOwner {
157157
NMonitoring::TDynamicCounters::TCounterPtr RecordsDeniedByHeader;
158158
std::shared_ptr<TSubColumnCounters> SubColumnCounters;
159159

160+
NMonitoring::TDynamicCounters::TCounterPtr HangingRequests;
161+
160162
public:
161163
const std::shared_ptr<TSubColumnCounters>& GetSubColumns() const {
162164
AFL_VERIFY(SubColumnCounters);
@@ -316,6 +318,10 @@ class TScanCounters: public TCommonCountersOwner {
316318
ReadingOverload->Add(1);
317319
}
318320

321+
void OnHangingRequestDetected() const {
322+
HangingRequests->Inc();
323+
}
324+
319325
TScanAggregations BuildAggregations();
320326

321327
void FillStats(::NKikimrTableStats::TTableStats& output) const;

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,15 @@ void TColumnShardScan::CheckHanging(const bool logging) const {
161161
"scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)("gen", ScanGen)("tablet", TabletId)(
162162
"debug", ScanIterator ? ScanIterator->DebugString() : Default<TString>())("last", LastResultInstant);
163163
}
164-
AFL_VERIFY(!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore() || ScanCountersPool.InWaiting())("scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)(
165-
"gen", ScanGen)("tablet", TabletId)("debug", ScanIterator->DebugString())(
166-
"counters", ScanCountersPool.DebugString());
164+
const bool ok = !!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore() || ScanCountersPool.InWaiting();
165+
AFL_VERIFY_DEBUG(ok)
166+
("scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)("gen", ScanGen)("tablet", TabletId)("debug", ScanIterator->DebugString())(
167+
"counters", ScanCountersPool.DebugString());
168+
if (!ok) {
169+
AFL_CRIT(NKikimrServices::TX_COLUMNSHARD_SCAN)("error", "CheckHanging")("scan_actor_id", ScanActorId)("tx_id", TxId)("scan_id", ScanId)("gen", ScanGen)(
170+
"tablet", TabletId)("debug", ScanIterator->DebugString())("counters", ScanCountersPool.DebugString());
171+
ScanCountersPool.OnHangingRequestDetected();
172+
}
167173
}
168174

169175
void TColumnShardScan::HandleScan(TEvents::TEvWakeup::TPtr& /*ev*/) {

0 commit comments

Comments
 (0)