issue-2725: correct issues

Author: vladstepanyuk

cloud/blockstore/libs/storage/core/config.cpp

@@ -491,7 +491,7 @@ TDuration MSeconds(ui32 value)
     xxx(VolumeProxyCacheRetryDuration,             TDuration, Seconds(15)     )\
                                                                                \
     xxx(UseDirectCopyRange,                             bool,      false         )\
-    xxx(UseDirectAcqruireReleaseDiskSending,            bool,      false         )\
+    xxx(UseDirectAcquireReleaseDevicesSending,          bool,      false         )\
     xxx(MaxShadowDiskFillBandwidth,                     ui32,      512           )\
     xxx(MaxShadowDiskFillIoDepth,                       ui32,      1             )\
     xxx(BackgroundOperationsTotalBandwidth,             ui32,      1024          )\

cloud/blockstore/libs/storage/core/config.h

@@ -570,7 +570,7 @@ class TStorageConfig
     TString GetCachedDiskAgentSessionsPath() const;
 
     bool GetUseDirectCopyRange() const;
-    [[nodiscard]] bool GetUseDirectAcquireReleaseDiskSending() const;
+    [[nodiscard]] bool GetUseDirectAcquireReleaseDevicesSending() const;
     ui32 GetMaxShadowDiskFillBandwidth() const;
     ui32 GetMaxShadowDiskFillIoDepth() const;
     ui32 GetBackgroundOperationsTotalBandwidth() const;

cloud/blockstore/libs/storage/core/proto_helpers.cpp

@@ -444,4 +444,15 @@ ui64 GetVolumeRequestId(const TEvDiskAgent::TEvZeroDeviceBlocksRequest& request)
     return request.Record.GetVolumeRequestId();
 }
 
+TString LogDevices(const TVector<NProto::TDeviceConfig>& devices)
+{
+    TStringBuilder sb;
+    sb << "( ";
+    for (const auto& d: devices) {
+        sb << d.GetDeviceUUID() << "@" << d.GetAgentId() << " ";
+    }
+    sb << ")";
+    return sb;
+}
+
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/core/proto_helpers.h

@@ -223,4 +223,5 @@ TBlockRange64 BuildRequestBlockRange(
 ui64 GetVolumeRequestId(const TEvDiskAgent::TEvWriteDeviceBlocksRequest& request);
 ui64 GetVolumeRequestId(const TEvDiskAgent::TEvZeroDeviceBlocksRequest& request);
 
+TString LogDevices(const TVector<NProto::TDeviceConfig>& devices);
 }   // namespace NCloud::NBlockStore::NStorage

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

@@ -879,19 +879,6 @@ bool ToLogicalBlocks(NProto::TDeviceConfig& device, ui32 logicalBlockSize)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TString LogDevices(const TVector<NProto::TDeviceConfig>& devices)
-{
-    TStringBuilder sb;
-    sb << "( ";
-    for (const auto& d: devices) {
-        sb << d.GetDeviceUUID() << "@" << d.GetAgentId() << " ";
-    }
-    sb << ")";
-    return sb;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 void TDiskRegistryActor::OnDiskAcquired(
     TVector<TAgentAcquireDevicesCachedRequest> sentAcquireRequests)
 {

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

@@ -503,6 +503,4 @@ class TDiskRegistryActor final
 // BLOCKSTORE_DISK_REGISTRY_COUNTER
 
 bool ToLogicalBlocks(NProto::TDeviceConfig& device, ui32 logicalBlockSize);
-TString LogDevices(const TVector<NProto::TDeviceConfig>& devices);
-
 }   // namespace NCloud::NBlockStore::NStorage

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

@@ -1,6 +1,7 @@
 #include "disk_registry_actor.h"
 
 #include <cloud/blockstore/libs/storage/api/disk_agent.h>
+#include <cloud/blockstore/libs/storage/core/proto_helpers.h>
 
 #include <cloud/blockstore/libs/kikimr/events.h>
 

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

@@ -1,4 +1,5 @@
 #include "disk_registry_actor.h"
+#include "cloud/blockstore/libs/storage/core/proto_helpers.h"
 
 #include <cloud/blockstore/libs/storage/api/disk_agent.h>
 

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

@@ -716,8 +716,8 @@ class TVolumeActor final
         const TEvDiskRegistry::TEvAcquireDiskResponse::TPtr& ev,
         const NActors::TActorContext& ctx);
 
-    void HandleAcquireDiskResponseImpl(
-        const NProto::TAcquireDiskResponse& record,
+    void HandleDevicesAcquireFinishedImpl(
+        const NProto::TError& error,
         const NActors::TActorContext& ctx);
 
     void AcquireDisk(
@@ -726,8 +726,14 @@ class TVolumeActor final
         NProto::EVolumeAccessMode accessMode,
         ui64 mountSeqNumber);
 
-    void SendProxylessAcquireDisk(
-        std::unique_ptr<TEvDiskRegistry::TEvAcquireDiskRequest> ev,
+    void SendAcquireDevicesToAgents(
+        TString clientId,
+        NProto::EVolumeAccessMode accessMode,
+        ui64 mountSeqNumber,
+        const NActors::TActorContext& ctx);
+
+    void HandleDevicesAcquireFinished(
+        const TEvVolumePrivate::TEvDevicesAcquireFinished::TPtr& ev,
         const NActors::TActorContext& ctx);
 
     void AcquireDiskIfNeeded(const NActors::TActorContext& ctx);
@@ -750,14 +756,18 @@ class TVolumeActor final
         const TEvDiskRegistry::TEvReleaseDiskResponse::TPtr& ev,
         const NActors::TActorContext& ctx);
 
-    void HandleReleaseDiskResponseImpl(
-        const NProto::TReleaseDiskResponse& record,
+    void HandleDevicesReleasedFinishedImpl(
+        const NProto::TError& error,
         const NActors::TActorContext& ctx);
 
     void ReleaseDisk(const NActors::TActorContext& ctx, const TString& clientId);
 
-    void SendProxylessReleaseDisk(
-        std::unique_ptr<TEvDiskRegistry::TEvReleaseDiskRequest> msg,
+    void SendReleaseDevicesToAgents(
+        const TString& clientId,
+        const NActors::TActorContext& ctx);
+
+    void HandleDevicesReleasedFinished(
+        const TEvVolumePrivate::TEvDevicesReleaseFinished::TPtr& ev,
         const NActors::TActorContext& ctx);
 
     void HandleAllocateDiskResponse(
@@ -1035,6 +1045,4 @@ class TVolumeActor final
 
 TString DescribeAllocation(const NProto::TAllocateDiskResponse& record);
 
-TString LogDevices(const TVector<NProto::TDeviceConfig>& devices);
-
 }   // namespace NCloud::NBlockStore::NStorage