YQ: Fix asan fails in ydb/tests/fq/pq_async_io (#13684)

ydb-platform · Jan 22, 2025 · 8fa34d2 · 8fa34d2
1 parent 25e80d8
commit 8fa34d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_rd_read_actor.cpp
@@ -495,7 +495,7 @@ void TDqPqRdReadActor::PassAway() { // Is called from Compute Actor
         StopSession(sessionInfo);
     }
     TActor<TDqPqRdReadActor>::PassAway();
-    
+
     // TODO: RetryQueue::Unsubscribe()
 }
 
@@ -773,9 +773,9 @@ void TDqPqRdReadActor::Handle(NActors::TEvents::TEvUndelivered::TPtr& ev) {
         if (sessionInfo.EventsQueue.HandleUndelivered(ev) == NYql::NDq::TRetryEventsQueue::ESessionState::SessionClosed) {
             if (sessionInfo.Generation == ev->Cookie) {
                 SRC_LOG_D("Erase session to " << ev->Sender.ToString());
-                Sessions.erase(ev->Sender);
                 ReadActorByEventQueueId.erase(sessionInfo.EventQueueId);
-                ReInit("Reset session state");
+                Sessions.erase(sessionIt);
+                ReInit("Reset session state (by TEvUndelivered)");
             }
         }
     }

diff --git a/ydb/tests/fq/pq_async_io/ut/dq_pq_rd_read_actor_ut.cpp b/ydb/tests/fq/pq_async_io/ut/dq_pq_rd_read_actor_ut.cpp
@@ -301,7 +301,7 @@ Y_UNIT_TEST_SUITE(TDqPqRdReadActorTests) {
     Y_UNIT_TEST_F(IgnoreUndeliveredWithWrongGeneration, TFixture) {
         StartSession(Source1);
         ProcessSomeMessages(0, {Message1, Message2}, RowDispatcher1);
-        MockUndelivered(RowDispatcher1, NActors::TEvents::TEvUndelivered::Disconnected);
+        MockUndelivered(RowDispatcher1, 999, NActors::TEvents::TEvUndelivered::Disconnected);
         ProcessSomeMessages(2, {Message3}, RowDispatcher1);
     }
 
@@ -505,6 +505,7 @@ Y_UNIT_TEST_SUITE(TDqPqRdReadActorTests) {
     Y_UNIT_TEST_F(IgnoreMessageIfNoSessions, TFixture) {
         StartSession(Source1);
         MockCoordinatorChanged(Coordinator2Id);
+        MockUndelivered(RowDispatcher1, 1);
         MockSessionError();
     }