Fix session_actor's handling of TEvCloseSessionRequest in CleanupState

1 files changed, 7 insertions, 1 deletions

diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
index 496470b1592..b9835c8e873 100644
--- a/ydb/core/kqp/session_actor/kqp_session_actor.cpp
+++ b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -1967,8 +1967,14 @@ public:
             PassAway();
         } else {
             CleanupCtx.reset();
+            bool doNotKeepSession = QueryState && !QueryState->KeepSession;
             QueryState.reset();
-            Become(&TKqpSessionActor::ReadyState);
+            if (doNotKeepSession) {
+                // TEvCloseSessionRequest was received in final=false CleanupState, so actor should rerun Cleanup with final=true
+                CleanupAndPassAway();
+            } else {
+                Become(&TKqpSessionActor::ReadyState);
+            }
         }
         ExecuterId = TActorId{};
     }