rollback-buffer

ydb-platform · Dec 27, 2024 · 527525e · 527525e
1 parent a131f66
commit 527525e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/ydb/core/kqp/runtime/kqp_write_actor.cpp b/ydb/core/kqp/runtime/kqp_write_actor.cpp
@@ -1987,9 +1987,7 @@ class TKqpBufferWriteActor :public TActorBootstrapped<TKqpBufferWriteActor>, pub
         }
 
         if (!TxManager->NeedCommit()) {
-            Rollback();
-            State = EState::FINISHED;
-            Send<ESendingType::Tail>(ExecuterActorId, new TEvKqpBuffer::TEvResult{});
+            RollbackAndDie();
         } else if (TxManager->IsSingleShard() && !TxManager->HasOlapTable() && (!WriteInfos.empty() || TxManager->HasTopics())) {
             TxManager->StartExecute();
             ImmediateCommit();
@@ -2001,9 +1999,14 @@ class TKqpBufferWriteActor :public TActorBootstrapped<TKqpBufferWriteActor>, pub
 
     void Handle(TEvKqpBuffer::TEvRollback::TPtr& ev) {
         ExecuterActorId = ev->Get()->ExecuterActorId;
+        RollbackAndDie();
+    }
+
+    void RollbackAndDie() {
         Rollback();
         State = EState::FINISHED;
         Send<ESendingType::Tail>(ExecuterActorId, new TEvKqpBuffer::TEvResult{});
+        PassAway();
     }
 
     void Handle(NKikimr::NEvents::TDataEvents::TEvWriteResult::TPtr& ev) {
@@ -2287,6 +2290,7 @@ class TKqpBufferWriteActor :public TActorBootstrapped<TKqpBufferWriteActor>, pub
             });
             ExecuterActorId = {};
             Y_ABORT_UNLESS(GetTotalMemory() == 0);
+            PassAway();
             return;
         }
     }