Skip to content

Commit 6b121ad

Browse files
authored
Break loop dependency in TDataAccessorRequest destructor (#14567)
1 parent 1e4ffc6 commit 6b121ad

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

ydb/core/tx/tiering/ut/ut_tiers.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
414414
Tests::NCommon::TLoggerInit(server->GetRuntime()).Clear().SetComponents({ NKikimrServices::TX_COLUMNSHARD }, "CS").Initialize();
415415

416416
auto& runtime = *server->GetRuntime();
417+
runtime.DisableBreakOnStopCondition();
417418
// runtime.SetLogPriority(NKikimrServices::TX_PROXY, NLog::PRI_TRACE);
418419
// runtime.SetLogPriority(NKikimrServices::KQP_YQL, NLog::PRI_TRACE);
419420

ydb/library/actors/testlib/test_runtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ namespace NActors {
12931293
case EEventAction::PROCESS:
12941294
UpdateFinalEventsStatsForEachContext(*ev);
12951295
SendInternal(ev.Release(), mbox.first.NodeId - FirstNodeId, false);
1296-
if (checkStopConditions(/* perMessage */ true)) {
1296+
if (AllowBreakOnStopCondition && checkStopConditions(/* perMessage */ true)) {
12971297
stopCondition = true;
12981298
}
12991299
break;

ydb/library/actors/testlib/test_runtime.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,9 @@ namespace NActors {
334334
bool IsScheduleForActorEnabled(const TActorId& actorId) const;
335335
TIntrusivePtr<NMonitoring::TDynamicCounters> GetDynamicCounters(ui32 nodeIndex = 0);
336336
void SetupMonitoring(ui16 monitoringPortOffset = 0, bool monitoringTypeAsync = false);
337+
void DisableBreakOnStopCondition() {
338+
AllowBreakOnStopCondition = false;
339+
}
337340

338341
using TEventObserverCollection = std::list<std::function<void(TAutoPtr<IEventHandle>& event)>>;
339342
class TEventObserverHolder {
@@ -790,7 +793,7 @@ namespace NActors {
790793
THashMap<TActorId, TString> ActorNames;
791794
TDispatchContext* CurrentDispatchContext;
792795
TVector<ui64> TxAllocatorTabletIds;
793-
796+
bool AllowBreakOnStopCondition = true;
794797
static ui32 NextNodeId;
795798
};
796799

0 commit comments

Comments
 (0)