fix coredumps simple (ydb-platform#12914)

zverevgeny · Jan 5, 2025 · c8ee433 · c8ee433
1 parent b3f1152
commit c8ee433
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/ydb/core/tx/columnshard/counters/writes_monitor.cpp b/ydb/core/tx/columnshard/counters/writes_monitor.cpp
@@ -15,14 +15,16 @@ void TWritesMonitor::OnStartWrite(const ui64 dataSize) {
     UpdateTabletCounters();
 }
 
-void TWritesMonitor::OnFinishWrite(const ui64 dataSize, const ui32 writesCount /*= 1*/) {
+void TWritesMonitor::OnFinishWrite(const ui64 dataSize, const ui32 writesCount /*= 1*/, const bool onDestroy /*= false*/) {
     AFL_VERIFY(writesCount <= WritesInFlightLocal);
     AFL_VERIFY(dataSize <= WritesSizeInFlightLocal);
     WritesSizeInFlightLocal -= dataSize;
     WritesInFlightLocal -= writesCount;
     AFL_VERIFY(0 <= WritesInFlight.Sub(writesCount));
     AFL_VERIFY(0 <= WritesSizeInFlight.Sub(dataSize));
-    UpdateTabletCounters();
+    if (!onDestroy) {
+        UpdateTabletCounters();
+    }
 }
 
 TString TWritesMonitor::DebugString() const {

diff --git a/ydb/core/tx/columnshard/counters/writes_monitor.h b/ydb/core/tx/columnshard/counters/writes_monitor.h
@@ -21,12 +21,12 @@ class TWritesMonitor: TNonCopyable {
     }
 
     ~TWritesMonitor() {
-        OnFinishWrite(WritesSizeInFlightLocal, WritesInFlightLocal);
+        OnFinishWrite(WritesSizeInFlightLocal, WritesInFlightLocal, true);
     }
 
     void OnStartWrite(const ui64 dataSize);
 
-    void OnFinishWrite(const ui64 dataSize, const ui32 writesCount = 1);
+    void OnFinishWrite(const ui64 dataSize, const ui32 writesCount = 1, const bool onDestroy = false);
 
     TString DebugString() const;
 

diff --git a/ydb/core/tx/columnshard/data_reader/actor.cpp b/ydb/core/tx/columnshard/data_reader/actor.cpp
@@ -59,6 +59,13 @@ void TActor::HandleExecute(NKqp::TEvKqpCompute::TEvScanError::TPtr& ev) {
     PassAway();
 }
 
+void TActor::HandleExecute(NActors::TEvents::TEvUndelivered::TPtr& ev) {
+    SwitchStage(std::nullopt, EStage::Finished);
+    AFL_ERROR(NKikimrServices::TX_COLUMNSHARD_RESTORE)("event", "problem_on_event_undelivered")("reason", ev->Get()->Reason);
+    RestoreTask->OnError("cannot delivery event: " + ::ToString(ev->Get()->Reason));
+    PassAway();
+}
+
 void TActor::HandleExecute(NActors::TEvents::TEvWakeup::TPtr& /*ev*/) {
     if (!CheckActivity()) {
         TBase::Send(*ScanActorId, new NKqp::TEvKqp::TEvAbortExecution(NYql::NDqProto::StatusIds::ABORTED, "external task aborted"));

diff --git a/ydb/core/tx/columnshard/data_reader/actor.h b/ydb/core/tx/columnshard/data_reader/actor.h
@@ -78,6 +78,7 @@ class TActor: public NActors::TActorBootstrapped<TActor> {
     void HandleExecute(NKqp::TEvKqpCompute::TEvScanInitActor::TPtr& ev);
     void HandleExecute(NKqp::TEvKqpCompute::TEvScanData::TPtr& ev);
     void HandleExecute(NKqp::TEvKqpCompute::TEvScanError::TPtr& ev);
+    void HandleExecute(NActors::TEvents::TEvUndelivered::TPtr& ev);
     void HandleExecute(NActors::TEvents::TEvWakeup::TPtr& ev);
 
 public:
@@ -95,6 +96,7 @@ class TActor: public NActors::TActorBootstrapped<TActor> {
                 hFunc(NKqp::TEvKqpCompute::TEvScanInitActor, HandleExecute);
                 hFunc(NKqp::TEvKqpCompute::TEvScanData, HandleExecute);
                 hFunc(NKqp::TEvKqpCompute::TEvScanError, HandleExecute);
+                hFunc(NActors::TEvents::TEvUndelivered, HandleExecute);
                 hFunc(NActors::TEvents::TEvWakeup, HandleExecute);
                 default:
                     AFL_VERIFY(false)("type", ev->GetTypeName());