Users/yegorskii/merge 23 3

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

@@ -53,6 +53,7 @@
 #include <cloud/storage/core/libs/iam/iface/client.h>
 #include <cloud/storage/core/libs/iam/iface/config.h>
 #include <cloud/storage/core/libs/kikimr/actorsystem.h>
+#include <cloud/storage/core/libs/kikimr/node_registration_settings.h>
 #include <cloud/storage/core/libs/kikimr/node.h>
 #include <cloud/storage/core/libs/kikimr/proxy.h>
 
@@ -216,18 +217,28 @@ void TBootstrapYdb::InitKikimrService()
         Log,
         PostponedCriticalEvents);
 
+    NCloud::NStorage::TNodeRegistrationSettings settings {
+        .MaxAttempts =
+            Configs->ServerConfig->GetNodeRegistrationMaxAttempts(),
+        .ErrorTimeout = Configs->ServerConfig->GetNodeRegistrationErrorTimeout(),
+        .RegistrationTimeout = Configs->ServerConfig->GetNodeRegistrationTimeout(),
+        .PathToGrpcCaFile = Configs->ServerConfig->GetRootCertsFile(),
+        .PathToGrpcCertFile = GetCertFileFromConfig(*Configs->ServerConfig),
+        .PathToGrpcPrivateKeyFile = GetCertPrivateKeyFileFromConfig(
+            *Configs->ServerConfig),
+        .NodeRegistrationToken = Configs->ServerConfig->GetNodeRegistrationToken(),
+        .NodeType = Configs->ServerConfig->GetNodeType(),
+    };
+
     NCloud::NStorage::TRegisterDynamicNodeOptions registerOpts {
         .Domain = Configs->Options->Domain,
         .SchemeShardDir = Configs->StorageConfig->GetSchemeShardDir(),
-        .NodeType = Configs->ServerConfig->GetNodeType(),
         .NodeBrokerAddress = Configs->Options->NodeBrokerAddress,
         .NodeBrokerPort = Configs->Options->NodeBrokerPort,
+        .UseNodeBrokerSsl = Configs->Options->UseNodeBrokerSsl,
         .InterconnectPort = Configs->Options->InterconnectPort,
         .LoadCmsConfigs = Configs->Options->LoadCmsConfigs,
-        .MaxAttempts = static_cast<int>(
-            Configs->ServerConfig->GetNodeRegistrationMaxAttempts()),
-        .ErrorTimeout = Configs->ServerConfig->GetNodeRegistrationErrorTimeout(),
-        .RegistrationTimeout = Configs->ServerConfig->GetNodeRegistrationTimeout()
+        .Settings = std::move(settings)
     };
 
     if (Configs->Options->LocationFile) {

cloud/blockstore/libs/disk_agent/bootstrap.cpp

@@ -292,20 +292,29 @@ void TBootstrap::InitKikimrService()
     Configs->InitDiagnosticsConfig();
     Configs->InitSpdkEnvConfig();
 
-    NCloud::NStorage::TRegisterDynamicNodeOptions registerOpts;
-    registerOpts.Domain = Configs->Options->Domain;
-    registerOpts.SchemeShardDir = Configs->StorageConfig->GetSchemeShardDir();
-    registerOpts.NodeType = Configs->Options->NodeType;
-    registerOpts.NodeBrokerAddress = Configs->Options->NodeBrokerAddress;
-    registerOpts.NodeBrokerPort = Configs->Options->NodeBrokerPort;
-    registerOpts.InterconnectPort = Configs->Options->InterconnectPort;
-    registerOpts.LoadCmsConfigs = Configs->Options->LoadCmsConfigs;
-    registerOpts.MaxAttempts =
-        Configs->ServerConfig->GetNodeRegistrationMaxAttempts();
-    registerOpts.RegistrationTimeout =
-        Configs->ServerConfig->GetNodeRegistrationTimeout();
-    registerOpts.ErrorTimeout =
-        Configs->ServerConfig->GetNodeRegistrationErrorTimeout();
+    NCloud::NStorage::TNodeRegistrationSettings settings {
+        .MaxAttempts =
+            Configs->ServerConfig->GetNodeRegistrationMaxAttempts(),
+        .ErrorTimeout = Configs->ServerConfig->GetNodeRegistrationErrorTimeout(),
+        .RegistrationTimeout = Configs->ServerConfig->GetNodeRegistrationTimeout(),
+        .PathToGrpcCaFile = Configs->ServerConfig->GetRootCertsFile(),
+        .PathToGrpcCertFile = GetCertFileFromConfig(*Configs->ServerConfig),
+        .PathToGrpcPrivateKeyFile = GetCertPrivateKeyFileFromConfig(
+            *Configs->ServerConfig),
+        .NodeRegistrationToken = Configs->ServerConfig->GetNodeRegistrationToken(),
+        .NodeType = Configs->Options->NodeType,
+    };
+
+    NCloud::NStorage::TRegisterDynamicNodeOptions registerOpts {
+        .Domain = Configs->Options->Domain,
+        .SchemeShardDir = Configs->StorageConfig->GetSchemeShardDir(),
+        .NodeBrokerAddress = Configs->Options->NodeBrokerAddress,
+        .NodeBrokerPort = Configs->Options->NodeBrokerPort,
+        .UseNodeBrokerSsl = Configs->Options->UseNodeBrokerSsl,
+        .InterconnectPort = Configs->Options->InterconnectPort,
+        .LoadCmsConfigs = Configs->Options->LoadCmsConfigs,
+        .Settings = std::move(settings)
+    };
 
     if (Configs->Options->LocationFile) {
         NProto::TLocation location;

cloud/blockstore/libs/server/config.cpp

@@ -98,6 +98,7 @@ constexpr TDuration Seconds(int s)
     xxx(NbdConnectionTimeout,        TDuration,             Seconds(86400)    )\
     xxx(EndpointProxySocketPath,     TString,               ""                )\
     xxx(AllowAllRequestsViaUDS,      bool,                  false             )\
+    xxx(NodeRegistrationToken,       TString,               "root@builtin"    )\
     xxx(EndpointStorageNotImplementedErrorIsFatal,  bool,   false             )\
     xxx(VhostServerTimeoutAfterParentExit, TDuration,       Seconds(60)       )\
 // BLOCKSTORE_SERVER_CONFIG
@@ -316,4 +317,22 @@ TServerAppConfig::DeprecatedGetRdmaClientConfig() const
     return ServerConfig->GetRdmaClientConfig();
 }
 
+TString GetCertFileFromConfig(const TServerAppConfig& serverConfig)
+{
+    const auto& certs = serverConfig.GetCerts();
+    if (certs.empty()) {
+        return serverConfig.GetCertFile();
+    }
+    return certs.front().CertFile;
+}
+
+TString GetCertPrivateKeyFileFromConfig(const TServerAppConfig& serverConfig)
+{
+    const auto& certs = serverConfig.GetCerts();
+    if (certs.empty()) {
+        return serverConfig.GetCertPrivateKeyFile();
+    }
+    return certs.front().CertPrivateKeyFile;
+}
+
 }   // namespace NCloud::NBlockStore::NServer

cloud/blockstore/libs/server/config.h

@@ -143,4 +143,9 @@ class TServerAppConfig
     bool GetRdmaClientEnabled() const;
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
+TString GetCertFileFromConfig(const TServerAppConfig& serverConfig);
+TString GetCertPrivateKeyFileFromConfig(const TServerAppConfig& serverConfig);
+
 }   // namespace NCloud::NBlockStore::NServer

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

@@ -34,6 +34,8 @@ namespace NCloud::NBlockStore::NStorage {
     xxx(GetVolumeInfo,            __VA_ARGS__)                                 \
     xxx(UpdateVolumeParams,       __VA_ARGS__)                                 \
     xxx(ChangeStorageConfig,      __VA_ARGS__)                                 \
+    xxx(GetStorageConfig,         __VA_ARGS__)                                 \
+
 // BLOCKSTORE_VOLUME_REQUESTS
 
 // requests forwarded from service to volume
@@ -326,6 +328,9 @@ struct TEvVolume
         EvPreparePartitionMigrationRequest = EvBegin + 56,
         EvPreparePartitionMigrationResponse = EvBegin + 57,
 
+        EvGetStorageConfigRequest = EvBegin + 58,
+        EvGetStorageConfigResponse = EvBegin + 59,
+
         EvEnd
     };
 

cloud/blockstore/libs/storage/protos/volume.proto

@@ -627,3 +627,28 @@ message TChangeStorageConfigResponse
     // Result Storage config.
     NProto.TStorageServiceConfig StorageConfig = 3;
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// GetStorageConfig request/response.
+
+message TGetStorageConfigRequest
+{
+    // Optional request headers.
+    THeaders Headers = 1;
+
+    // Label of volume to query its storage config. Or empty to
+    // query server storage config.
+    string DiskId = 2;
+}
+
+message TGetStorageConfigResponse
+{
+    // Optional error, set only if error happened.
+    NCloud.NProto.TError Error = 1;
+
+    // Request traces.
+    NCloud.NProto.TTraceInfo Trace = 2;
+
+    // Result Storage config.
+    NProto.TStorageServiceConfig StorageConfig = 3;
+}

cloud/blockstore/libs/storage/service/CMakeLists.darwin-x86_64.txt

@@ -62,6 +62,7 @@ target_sources(libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_diskregistry_tablet_info.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_nameservice_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_partition_info.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_storage_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_kill_tablet.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_migration_disk_registry_device.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_modify_tags.cpp

cloud/blockstore/libs/storage/service/CMakeLists.linux-aarch64.txt

@@ -63,6 +63,7 @@ target_sources(libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_diskregistry_tablet_info.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_nameservice_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_partition_info.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_storage_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_kill_tablet.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_migration_disk_registry_device.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_modify_tags.cpp

cloud/blockstore/libs/storage/service/CMakeLists.linux-x86_64.txt

@@ -63,6 +63,7 @@ target_sources(libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_diskregistry_tablet_info.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_nameservice_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_partition_info.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_storage_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_kill_tablet.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_migration_disk_registry_device.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_modify_tags.cpp

cloud/blockstore/libs/storage/service/CMakeLists.windows-x86_64.txt

@@ -62,6 +62,7 @@ target_sources(libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_diskregistry_tablet_info.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_nameservice_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_partition_info.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_get_storage_config.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_kill_tablet.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_migration_disk_registry_device.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/service/service_actor_actions_modify_tags.cpp

cloud/blockstore/libs/storage/service/service_actor.h

@@ -399,6 +399,10 @@ class TServiceActor final
     TResultOrError<NActors::IActorPtr> CreatePartiallySuspendDiskAgentActor(
         TRequestInfoPtr requestInfo,
         TString input);
+
+    TResultOrError<NActors::IActorPtr> CreateGetStorageConfigActor(
+        TRequestInfoPtr requestInfo,
+        TString input);
 };
 
 ////////////////////////////////////////////////////////////////////////////////

cloud/blockstore/libs/storage/service/service_actor_actions.cpp

@@ -85,6 +85,7 @@ void TServiceActor::HandleExecuteAction(
         {"getdiskagentnodeid",                &TServiceActor::CreateGetDiskAgentNodeIdActor                },
         {"waitdependentdiskstoswitchnode",    &TServiceActor::CreateWaitDependentDisksToSwitchNodeActor    },
         {"partiallysuspenddiskagent",         &TServiceActor::CreatePartiallySuspendDiskAgentActor         },
+        {"getstorageconfig",                  &TServiceActor::CreateGetStorageConfigActor                  },
     };
 
     NProto::TError error;