issue-2725: fix tests

cloud/blockstore/libs/storage/core/acquire_disk_actor.cpp → cloud/blockstore/libs/storage/core/acquire_devices_actor.cpp

@@ -1,4 +1,4 @@
-#include "acquire_release_disk.h"
+#include "acquire_release_devices.h"
 
 #include <cloud/blockstore/libs/storage/core/proto_helpers.h>
 #include <cloud/storage/core/libs/actors/helpers.h>

cloud/blockstore/libs/storage/core/release_disk_actor.cpp → cloud/blockstore/libs/storage/core/release_devices_actor.cpp

@@ -1,4 +1,4 @@
-#include "acquire_release_disk.h"
+#include "acquire_release_devices.h"
 
 #include <cloud/blockstore/libs/storage/core/proto_helpers.h>
 #include <cloud/storage/core/libs/actors/helpers.h>

cloud/blockstore/libs/storage/core/ya.make

@@ -3,7 +3,7 @@ LIBRARY()
 GENERATE_ENUM_SERIALIZATION(mount_token.h)
 
 SRCS(
-    acquire_disk_actor.cpp
+    acquire_devices_actor.cpp
     block_handler.cpp
     compaction_map.cpp
     compaction_options.cpp
@@ -20,7 +20,7 @@ SRCS(
     pending_request.cpp
     probes.cpp
     proto_helpers.cpp
-    release_disk_actor.cpp
+    release_devices_actor.cpp
     request_buffer.cpp
     request_info.cpp
     storage_request_counters.cpp

cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp

@@ -188,6 +188,24 @@ void TDiskRegistryActor::BeforeDie(const NActors::TActorContext& ctx)
             MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
     }
     PendingDiskDeallocationRequests.clear();
+
+    for (auto& [actorId, requestInfo]: PendingAcquireDiskRequests) {
+        NCloud::Reply(
+            ctx,
+            *requestInfo,
+            std::make_unique<TEvDiskRegistry::TEvAcquireDiskResponse>(
+                MakeTabletIsDeadError(E_REJECTED, __LOCATION__)));
+    }
+    PendingAcquireDiskRequests.clear();
+
+    for (auto& [actorId, requestInfo]: PendingReleaseDiskRequests) {
+        NCloud::Reply(
+            ctx,
+            *requestInfo,
+            std::make_unique<TEvDiskRegistry::TEvReleaseDiskResponse>(
+                MakeTabletIsDeadError(E_REJECTED, __LOCATION__)));
+    }
+    PendingReleaseDiskRequests.clear();
 }
 
 void TDiskRegistryActor::OnDetach(const TActorContext& ctx)

cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.h

@@ -15,7 +15,7 @@
 #include <cloud/blockstore/libs/storage/api/disk_agent.h>
 #include <cloud/blockstore/libs/storage/api/disk_registry.h>
 #include <cloud/blockstore/libs/storage/api/service.h>
-#include <cloud/blockstore/libs/storage/core/acquire_release_disk.h>
+#include <cloud/blockstore/libs/storage/core/acquire_release_devices.h>
 #include <cloud/blockstore/libs/storage/core/config.h>
 #include <cloud/blockstore/libs/storage/core/monitoring_utils.h>
 #include <cloud/blockstore/libs/storage/core/pending_request.h>
@@ -118,8 +118,8 @@ class TDiskRegistryActor final
     // Requests in-progress
     THashSet<NActors::TActorId> Actors;
 
-    THashMap<NActors::TActorId, TRequestInfoPtr> AcquireDiskRequests;
-    THashMap<NActors::TActorId, TRequestInfoPtr> ReleaseDiskRequests;
+    THashMap<NActors::TActorId, TRequestInfoPtr> PendingAcquireDiskRequests;
+    THashMap<NActors::TActorId, TRequestInfoPtr> PendingReleaseDiskRequests;
 
     TLogbrokerServicePtr LogbrokerService;
     NNotify::IServicePtr NotifyService;

cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_acquire_release.cpp

@@ -85,7 +85,7 @@ void TDiskRegistryActor::HandleAcquireDisk(
         /*muteIOErrors=*/false,
         TBlockStoreComponents::DISK_REGISTRY);
     Actors.insert(actor);
-    AcquireDiskRequests[actor] =
+    PendingAcquireDiskRequests[actor] =
         CreateRequestInfo(ev->Sender, ev->Cookie, msg->CallContext);
 }
 
@@ -99,11 +99,13 @@ void TDiskRegistryActor::HandleDevicesAcquireFinished(
 
     OnDiskAcquired(std::move(msg->SentRequests));
 
-    auto reqInfo = AcquireDiskRequests.at(ev->Sender);
+    auto reqInfo = PendingAcquireDiskRequests.at(ev->Sender);
 
     auto response = std::make_unique<TEvDiskRegistry::TEvAcquireDiskResponse>(
         std::move(msg->Error));
 
+    const auto* disk = State->GetDisk(msg->DiskId);
+
     if (HasError(response->GetError())) {
         LOG_ERROR(
             ctx,
@@ -117,13 +119,16 @@ void TDiskRegistryActor::HandleDevicesAcquireFinished(
         response->Record.MutableDevices()->Reserve(msg->Devices.size());
 
         for (auto& device: msg->Devices) {
+            if (disk) {
+                ToLogicalBlocks(device, disk->LogicalBlockSize);
+            }
             *response->Record.AddDevices() = std::move(device);
         }
     }
 
     NCloud::Reply(ctx, *reqInfo, std::move(response));
     Actors.erase(ev->Sender);
-    AcquireDiskRequests.erase(ev->Sender);
+    PendingAcquireDiskRequests.erase(ev->Sender);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -214,7 +219,7 @@ void TDiskRegistryActor::HandleReleaseDisk(
         TBlockStoreComponents::DISK_REGISTRY);
 
     Actors.insert(actor);
-    ReleaseDiskRequests[actor] =
+    PendingReleaseDiskRequests[actor] =
         CreateRequestInfo(ev->Sender, ev->Cookie, msg->CallContext);
 }
 
@@ -227,14 +232,14 @@ void TDiskRegistryActor::HandleDevicesReleaseFinished(
     OnDiskReleased(msg->SentRequests);
 
     State->FinishAcquireDisk(msg->DiskId);
-    auto reqInfo = ReleaseDiskRequests.at(ev->Sender);
+    auto reqInfo = PendingReleaseDiskRequests.at(ev->Sender);
 
     auto response =
         std::make_unique<TEvDiskRegistry::TEvReleaseDiskResponse>(msg->Error);
     NCloud::Reply(ctx, *reqInfo, std::move(response));
 
     Actors.erase(ev->Sender);
-    ReleaseDiskRequests.erase(ev->Sender);
+    PendingReleaseDiskRequests.erase(ev->Sender);
 }
 
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/disk_registry/disk_registry_private.h

@@ -5,7 +5,7 @@
 #include <cloud/blockstore/libs/kikimr/components.h>
 #include <cloud/blockstore/libs/kikimr/events.h>
 #include <cloud/blockstore/libs/storage/api/disk_agent.h>
-#include <cloud/blockstore/libs/storage/core/acquire_release_disk.h>
+#include <cloud/blockstore/libs/storage/core/acquire_release_devices.h>
 #include <cloud/blockstore/libs/storage/core/request_info.h>
 #include <cloud/blockstore/libs/storage/protos/disk.pb.h>
 

cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp

@@ -3363,6 +3363,12 @@ NProto::EDiskState TDiskRegistryState::GetDiskState(const TDiskId& diskId) const
     return disk->State;
 }
 
+const TDiskRegistryState::TDiskState* TDiskRegistryState::GetDisk(
+    const TDiskId& diskId) const
+{
+    return Disks.FindPtr(diskId);
+}
+
 NProto::TError TDiskRegistryState::GetShadowDiskId(
     const TDiskId& sourceDiskId,
     const TCheckpointId& checkpointId,

cloud/blockstore/libs/storage/disk_registry/disk_registry_state.h

@@ -447,6 +447,7 @@ class TDiskRegistryState
 
     NProto::TError GetDiskInfo(const TDiskId& diskId, TDiskInfo& diskInfo) const;
     NProto::EDiskState GetDiskState(const TDiskId& diskId) const;
+    const TDiskState* GetDisk(const TDiskId& diskId) const;
     NProto::TError GetShadowDiskId(
         const TDiskId& sourceDiskId,
         const TCheckpointId& checkpointId,

cloud/blockstore/libs/storage/disk_registry/disk_registry_ut_session.cpp

@@ -507,7 +507,8 @@ Y_UNIT_TEST_SUITE(TDiskRegistryTest)
 
         runtime->SetObserverFunc( [&] (TAutoPtr<IEventHandle>& event) {
             switch (event->GetTypeRewrite()) {
-                case TEvDiskRegistryPrivate::EvFinishAcquireDiskResponse: {
+                case NAcquireReleaseDevices::TEvDevicesAcquireFinished::
+                    EventType: {
                     finished = true;
                     break;
                 }
@@ -676,10 +677,7 @@ Y_UNIT_TEST_SUITE(TDiskRegistryTest)
         }
 
         {
-            auto response = diskRegistry.RemoveDiskSession(
-                "disk-1",
-                "session-1",
-                TVector<TAgentReleaseDevicesCachedRequest>());
+            auto response = diskRegistry.ReleaseDisk("disk-1", "session-1");
             UNIT_ASSERT(!HasError(response->GetError()));
         }
     }

cloud/blockstore/libs/storage/disk_registry/testlib/test_env.h

@@ -780,18 +780,6 @@ class TDiskRegistryClient
             std::move(devices));
     }
 
-    auto CreateRemoveDiskSessionRequest(
-        TString diskId,
-        TString clientId,
-        TVector<TAgentReleaseDevicesCachedRequest> sentRequests)
-    {
-        return std::make_unique<
-            TEvDiskRegistryPrivate::TEvRemoveDiskSessionRequest>(
-            std::move(diskId),
-            std::move(clientId),
-            std::move(sentRequests));
-    }
-
     auto CreateUpdateAgentStatsRequest(NProto::TAgentStats stats)
     {
         auto request = std::make_unique<TEvDiskRegistry::TEvUpdateAgentStatsRequest>();

cloud/blockstore/libs/storage/volume/volume_actor.h

@@ -19,7 +19,7 @@
 #include <cloud/blockstore/libs/storage/api/service.h>
 #include <cloud/blockstore/libs/storage/api/stats_service.h>
 #include <cloud/blockstore/libs/storage/api/volume.h>
-#include <cloud/blockstore/libs/storage/core/acquire_release_disk.h>
+#include <cloud/blockstore/libs/storage/core/acquire_release_devices.h>
 #include <cloud/blockstore/libs/storage/core/config.h>
 #include <cloud/blockstore/libs/storage/core/disk_counters.h>
 #include <cloud/blockstore/libs/storage/core/metrics.h>