Fix a state detach race on slower coordinator restart KIKIMR-18580

1 files changed, 3 insertions, 0 deletions

diff --git a/ydb/core/tx/coordinator/coordinator_state.cpp b/ydb/core/tx/coordinator/coordinator_state.cpp
index a46b43b7107..03590194b87 100644
--- a/ydb/core/tx/coordinator/coordinator_state.cpp
+++ b/ydb/core/tx/coordinator/coordinator_state.cpp
@@ -29,12 +29,14 @@ void TCoordinatorStateActor::ConfirmPersistent() {
 
 void TCoordinatorStateActor::OnTabletDestroyed() {
     Y_VERIFY(Owner, "Unexpected OnTabletDestroyed from detached tablet");
+    Y_VERIFY(Owner->CoordinatorStateActor == nullptr, "OnTabletDestroyed called with state actor still attached");
     PreserveState();
     Owner = nullptr;
 }
 
 void TCoordinatorStateActor::OnTabletDead() {
     Y_VERIFY(Owner, "Unexpected OnTabletDead from detached tablet");
+    Y_VERIFY(Owner->CoordinatorStateActor == nullptr, "OnTabletDead called with state actor still attached");
     PreserveState();
     Owner = nullptr;
 
@@ -93,6 +95,7 @@ void TCoordinatorStateActor::Handle(TEvTxCoordinator::TEvCoordinatorStateRequest
 
     if (Owner) {
         // New generation may request state before current tablet dies
+        Owner->DetachStateActor();
         OnTabletDead();
     }