merge rdma fast data path to stable

cloud/blockstore/libs/common/CMakeLists.darwin-x86_64.txt

@@ -23,6 +23,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )

cloud/blockstore/libs/common/CMakeLists.linux-aarch64.txt

@@ -24,6 +24,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )

cloud/blockstore/libs/common/CMakeLists.linux-x86_64.txt

@@ -24,6 +24,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )

cloud/blockstore/libs/common/CMakeLists.windows-x86_64.txt

@@ -23,6 +23,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )

cloud/blockstore/libs/common/device_path.cpp

@@ -0,0 +1,55 @@
+#include "device_path.h"
+
+#include <library/cpp/uri/uri.h>
+
+#include <util/string/builder.h>
+
+namespace NCloud::NBlockStore {
+
+NProto::TError DevicePath::Parse(const TString& devicePath)
+{
+    // rdma://myt1-ct5-13.cloud.yandex.net:10020/62ccf40f2743308191205ad6391bfa06
+
+    NUri::TUri uri;
+    auto res = uri.Parse(
+        devicePath,
+        NUri::TFeature::FeaturesDefault |
+            NUri::TFeature::FeatureSchemeFlexible);
+    if (res != NUri::TState::ParsedOK) {
+        return MakeError(
+            E_FAIL,
+            TStringBuilder() << "invalid device path " << devicePath);
+    }
+
+    if (uri.GetField(NUri::TField::FieldScheme) != Protocol) {
+        return MakeError(
+            E_FAIL,
+            TStringBuilder()
+            << "device path doesn't start with "
+            << Protocol << "://, " << devicePath);
+    }
+
+    auto path = uri.GetField(NUri::TField::FieldPath);
+    if (path.size() < 2 || path[0] != '/') {
+        return MakeError(
+            E_FAIL,
+            TStringBuilder()
+                << "invalid uuid inside device path " << devicePath);
+    }
+
+    Host = uri.GetHost();
+    Port = uri.GetPort();
+    Uuid = path.substr(1);
+
+    return {};
+}
+
+TString DevicePath::Serialize() const
+{
+    return TStringBuilder()
+        << Protocol << "://"
+        << Host << ":" << Port
+        << "/" << Uuid;
+}
+
+}   // namespace NCloud::NBlockStore

cloud/blockstore/libs/common/device_path.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cloud/storage/core/libs/common/error.h>
+
+#include <util/generic/string.h>
+
+namespace NCloud::NBlockStore {
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct DevicePath
+{
+    TString Protocol;
+    TString Host;
+    ui16 Port;
+    TString Uuid;
+
+    DevicePath(
+            const TString protocol,
+            const TString& host = {},
+            ui16 port = 0,
+            const TString& uuid = {})
+        : Protocol(protocol)
+        , Host(host)
+        , Port(port)
+        , Uuid(uuid)
+    {}
+    NProto::TError Parse(const TString& devicePath);
+    TString Serialize() const;
+};
+
+}   // namespace NCloud::NBlockStore

cloud/blockstore/libs/common/device_path_ut.cpp

@@ -0,0 +1,50 @@
+#include "device_path.h"
+
+#include <library/cpp/testing/unittest/registar.h>
+
+namespace NCloud::NBlockStore {
+
+////////////////////////////////////////////////////////////////////////////////
+
+Y_UNIT_TEST_SUITE(TDevicePathTest)
+{
+    Y_UNIT_TEST(TestParseValidDevicePath)
+    {
+        DevicePath devPath("rdma");
+        auto error = devPath.Parse("rdma://a.b.c.d:10020/11223344");
+        UNIT_ASSERT_C(!HasError(error), error);
+
+        UNIT_ASSERT_EQUAL(devPath.Protocol, "rdma");
+        UNIT_ASSERT_EQUAL(devPath.Host, "a.b.c.d");
+        UNIT_ASSERT_EQUAL(devPath.Port, 10020);
+        UNIT_ASSERT_EQUAL(devPath.Uuid, "11223344");
+    }
+
+    Y_UNIT_TEST(TestParseInvalidProtocol)
+    {
+        DevicePath devPath("unknown");
+        auto error = devPath.Parse("rdma://a.b.c.d:10020/11223344");
+        UNIT_ASSERT(HasError(error));
+    }
+
+    Y_UNIT_TEST(TestParseNoUuid)
+    {
+        DevicePath devPath("rdma");
+        auto error = devPath.Parse("rdma://a.b.c.d:10020");
+        UNIT_ASSERT(HasError(error));
+    }
+
+    Y_UNIT_TEST(TestSerialize)
+    {
+        auto expectedPath = "rdma://a.b.c.d:10020/11223344";
+        DevicePath devPath("rdma", "a.b.c.d", 10020, "11223344");
+        UNIT_ASSERT_EQUAL(devPath.Serialize(), expectedPath);
+
+        DevicePath devPath2("rdma");
+        auto error = devPath2.Parse(expectedPath);
+        UNIT_ASSERT_C(!HasError(error), error);
+        UNIT_ASSERT_EQUAL(expectedPath, devPath2.Serialize());
+    }
+}
+
+}   // namespace NCloud::NBlockStore

cloud/blockstore/libs/common/ut/CMakeLists.darwin-x86_64.txt

@@ -15,6 +15,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -29,6 +30,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(

cloud/blockstore/libs/common/ut/CMakeLists.linux-aarch64.txt

@@ -15,6 +15,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -32,6 +33,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(

cloud/blockstore/libs/common/ut/CMakeLists.linux-x86_64.txt

@@ -16,6 +16,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -33,6 +34,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(

cloud/blockstore/libs/common/ut/CMakeLists.windows-x86_64.txt

@@ -15,13 +15,15 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
 target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(

cloud/blockstore/libs/common/ut/ya.make

@@ -10,7 +10,12 @@ SRCS(
     caching_allocator_ut.cpp
     block_checksum_ut.cpp
     block_range_ut.cpp
+    device_path_ut.cpp
     iovector_ut.cpp
 )
 
+PEERDIR(
+    library/cpp/uri
+)
+
 END()

cloud/blockstore/libs/common/ya.make

@@ -4,13 +4,14 @@ SRCS(
     block_checksum.cpp
     block_range.cpp
     caching_allocator.cpp
+    device_path.cpp
     iovector.cpp
     typeinfo.cpp
 )
 
 PEERDIR(
     cloud/blockstore/public/api/protos
-    
+
     cloud/storage/core/libs/common
 
     library/cpp/digest/crc32c

cloud/blockstore/libs/daemon/common/bootstrap.cpp

@@ -28,6 +28,7 @@
 #include <cloud/blockstore/libs/encryption/encryption_client.h>
 #include <cloud/blockstore/libs/encryption/encryption_key.h>
 #include <cloud/blockstore/libs/encryption/encryption_service.h>
+#include <cloud/blockstore/libs/endpoints/endpoint_events.h>
 #include <cloud/blockstore/libs/endpoints/endpoint_listener.h>
 #include <cloud/blockstore/libs/endpoints/endpoint_manager.h>
 #include <cloud/blockstore/libs/endpoints/service_endpoint.h>
@@ -210,6 +211,7 @@ void TBootstrapBase::Init()
     Executor = TExecutor::Create("SVC");
 
     VolumeBalancerSwitch = CreateVolumeBalancerSwitch();
+    EndpointEventHandler = CreateEndpointEventProxy();
 
     switch (Configs->Options->ServiceKind) {
         case TOptionsCommon::EServiceKind::Ydb:
@@ -479,6 +481,7 @@ void TBootstrapBase::Init()
         Logging,
         ServerStats,
         Executor,
+        EndpointEventHandler,
         std::move(sessionManager),
         std::move(endpointListeners),
         Configs->ServerConfig->GetNbdSocketSuffix());

cloud/blockstore/libs/daemon/common/bootstrap.h

@@ -69,6 +69,7 @@ class TBootstrapBase
     ICachingAllocatorPtr Allocator;
     IStorageProviderPtr AioStorageProvider;
     IEndpointServicePtr EndpointService;
+    IEndpointEventProxyPtr EndpointEventHandler;
     NRdma::IServerPtr RdmaServer;
     NRdma::IClientPtr RdmaClient;
     ITaskQueuePtr RdmaThreadPool;

cloud/blockstore/libs/daemon/ydb/bootstrap.cpp

@@ -15,6 +15,7 @@
 #include <cloud/blockstore/libs/discovery/fetch.h>
 #include <cloud/blockstore/libs/discovery/healthcheck.h>
 #include <cloud/blockstore/libs/discovery/ping.h>
+#include <cloud/blockstore/libs/endpoints/endpoint_events.h>
 #include <cloud/blockstore/libs/kms/iface/compute_client.h>
 #include <cloud/blockstore/libs/kms/iface/key_provider.h>
 #include <cloud/blockstore/libs/kms/iface/kms_client.h>
@@ -528,6 +529,7 @@ void TBootstrapYdb::InitKikimrService()
             return FindPtr(nodes, fqdn) || CityHash64(fqdn) % 100 < p;
         }();
     args.VolumeBalancerSwitch = VolumeBalancerSwitch;
+    args.EndpointEventHandler = EndpointEventHandler;
 
     ActorSystem = NStorage::CreateActorSystem(args);
 

cloud/blockstore/libs/diagnostics/critical_events.h

@@ -50,6 +50,7 @@ namespace NCloud::NBlockStore {
     xxx(DiskAgentConfigMismatch)                                               \
     xxx(DiskRegistryDeviceNotFoundSoft)                                        \
     xxx(DiskRegistrySourceDiskNotFound)                                        \
+    xxx(EndpointSwitchFailure)                                                 \
 // BLOCKSTORE_CRITICAL_EVENTS
 
 #define BLOCKSTORE_IMPOSSIBLE_EVENTS(xxx)                                      \

cloud/blockstore/libs/endpoints/CMakeLists.darwin-x86_64.txt

@@ -23,6 +23,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp

cloud/blockstore/libs/endpoints/CMakeLists.linux-aarch64.txt

@@ -24,6 +24,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp

cloud/blockstore/libs/endpoints/CMakeLists.linux-x86_64.txt

@@ -24,6 +24,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp

cloud/blockstore/libs/endpoints/CMakeLists.windows-x86_64.txt

@@ -23,6 +23,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp

cloud/blockstore/libs/endpoints/endpoint_events.cpp

@@ -0,0 +1,42 @@
+#include "endpoint_events.h"
+
+namespace NCloud::NBlockStore::NServer {
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+
+class TEndpointEventProxy: public IEndpointEventProxy
+{
+private:
+    IEndpointEventHandlerPtr Handler;
+
+public:
+    void OnVolumeConnectionEstablished(const TString& diskId) override;
+    void Register(IEndpointEventHandlerPtr listener) override;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+void TEndpointEventProxy::OnVolumeConnectionEstablished(const TString& diskId)
+{
+    if (Handler) {
+        Handler->OnVolumeConnectionEstablished(diskId);
+    }
+}
+
+void TEndpointEventProxy::Register(IEndpointEventHandlerPtr listener)
+{
+    Handler = std::move(listener);
+}
+
+}   // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+IEndpointEventProxyPtr CreateEndpointEventProxy()
+{
+    return std::make_shared<TEndpointEventProxy>();
+}
+
+}   // namespace NCloud::NBlockStore::NServer