Fix failing asan tests (#13105)

ydb-platform · Dec 28, 2024 · 312885a · 312885a
1 parent 731cf81
commit 312885a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ydb/core/mind/bscontroller/console_interaction.cpp b/ydb/core/mind/bscontroller/console_interaction.cpp
@@ -54,8 +54,8 @@ namespace NKikimr::NBsController {
 
     void TBlobStorageController::TConsoleInteraction::MakeGetBlock() {
         auto ev = MakeHolder<TEvBlobStorage::TEvGetBlock>(Self.TabletID(), TInstant::Max());
-        auto proxyId = MakeBlobStorageProxyID(Self.Info()->GroupFor(0, Self.Executor()->Generation()));
-        TActivationContext::Schedule(TDuration::MilliSeconds(GetBlockBackoff.NextBackoffMs()), new IEventHandle(proxyId, Self.SelfId(), ev.Release()));
+        auto bsProxyEv = CreateEventForBSProxy(Self.SelfId(), Self.Info()->GroupFor(0, Self.Executor()->Generation()), ev.Release(), 0);
+        TActivationContext::Schedule(TDuration::MilliSeconds(GetBlockBackoff.NextBackoffMs()), bsProxyEv);
     }
 
     void TBlobStorageController::TConsoleInteraction::MakeRetrySession() {
@@ -238,11 +238,13 @@ namespace NKikimr::NBsController {
             case NKikimrProto::OK:
                 if (generation <= blockedGeneration) {
                     Self.PassAway();
+                    return;
                 }
                 if (generation == blockedGeneration + 1 && NeedRetrySession) {
                     MakeRetrySession();
                     return;
                 }
+                Y_VERIFY_DEBUG_S(generation == blockedGeneration + 1, "BlockedGeneration#" << blockedGeneration << " Tablet generation#" << generation);
                 break;
             case NKikimrProto::BLOCKED:
                 Self.PassAway();