fix

Author: nikvas0

ydb/core/kqp/runtime/kqp_write_actor.cpp

@@ -1186,17 +1186,18 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
             return;
         }
 
+        const auto& reattachState = TxManager->GetReattachState(ev->Get()->TabletId);
+
         const auto state = TxManager->GetState(ev->Get()->TabletId);
         if ((state == IKqpTransactionManager::PREPARED
                     || state == IKqpTransactionManager::EXECUTING)
                 && TxManager->ShouldReattach(ev->Get()->TabletId, TlsActivationContext->Now())) {
             // Disconnected while waiting for other shards to prepare
-            auto& reattachState = TxManager->GetReattachState(ev->Get()->TabletId);
             CA_LOG_N("Shard " << ev->Get()->TabletId << " delivery problem (reattaching in "
                         << reattachState.ReattachInfo.Delay << ")");
 
             Schedule(reattachState.ReattachInfo.Delay, new TEvPrivate::TEvReattachToShard(ev->Get()->TabletId));
-        } else if (state == IKqpTransactionManager::EXECUTING && !ev->Get()->NotDelivered) {
+        } else if (state == IKqpTransactionManager::EXECUTING && (!ev->Get()->NotDelivered || reattachState.Cookie != 0)) {
             TxManager->SetError(ev->Get()->TabletId);
             RuntimeError(
                 NYql::NDqProto::StatusIds::UNDETERMINED,
@@ -1209,7 +1210,7 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
         } else if (state == IKqpTransactionManager::PROCESSING
                 || state == IKqpTransactionManager::PREPARING
                 || state == IKqpTransactionManager::PREPARED
-                || (state == IKqpTransactionManager::EXECUTING && ev->Get()->NotDelivered)) {
+                || (state == IKqpTransactionManager::EXECUTING && (ev->Get()->NotDelivered && reattachState.Cookie == 0))) {
             TxManager->SetError(ev->Get()->TabletId);
             RuntimeError(
                 NYql::NDqProto::StatusIds::UNAVAILABLE,
@@ -1228,7 +1229,7 @@ class TKqpTableWriteActor : public TActorBootstrapped<TKqpTableWriteActor> {
         const auto& record = ev->Get()->Record;
         const ui64 shardId = record.GetTabletId();
 
-        auto& reattachState = TxManager->GetReattachState(shardId);
+        const auto& reattachState = TxManager->GetReattachState(shardId);
         if (reattachState.Cookie != ev->Cookie) {
             return;
         }

ydb/core/kqp/ut/effects/ya.make

@@ -15,6 +15,7 @@ SRCS(
     kqp_immediate_effects_ut.cpp
     kqp_inplace_update_ut.cpp
     kqp_overload_ut.cpp
+    kqp_reattach_ut.cpp
     kqp_write_ut.cpp
 )