issue-1946: remove duplicated code (#2040)

* issue-1946: remove duplicated code * fix build * update * update
ydb-platform · Sep 16, 2024 · b9d76e7 · b9d76e7
1 parent 37ab38e
commit b9d76e7
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 79 deletions.
diff --git a/cloud/blockstore/libs/daemon/ydb/config_initializer.cpp b/cloud/blockstore/libs/daemon/ydb/config_initializer.cpp
@@ -59,7 +59,12 @@ void TConfigInitializerYdb::InitStorageConfig()
         ParseProtoTextFromFileRobust(Options->StorageConfig, storageConfig);
     }
 
-    AdaptNodeRegistrationParams(storageConfig);
+    if (ServerConfig && ServerConfig->GetServerConfig()) {
+        NStorage::AdaptNodeRegistrationParams(
+            {}, // overriddenNodeType, node type is not passed in cmd line
+            *ServerConfig->GetServerConfig(),
+            storageConfig);
+    }
 
     SetupStorageConfig(storageConfig);
 
@@ -264,7 +269,12 @@ void TConfigInitializerYdb::ApplyStorageServiceConfig(const TString& text)
     NProto::TStorageServiceConfig storageConfig;
     ParseProtoTextFromStringRobust(text, storageConfig);
 
-    AdaptNodeRegistrationParams(storageConfig);
+    if (ServerConfig && ServerConfig->GetServerConfig()) {
+        NStorage::AdaptNodeRegistrationParams(
+            {}, // overriddenNodeType, node type is not passed in cmd line
+            *ServerConfig->GetServerConfig(),
+            storageConfig);
+    }
 
     SetupStorageConfig(storageConfig);
 
@@ -390,38 +400,4 @@ void TConfigInitializerYdb::ApplyCustomCMSConfigs(const NKikimrConfig::TAppConfi
     }
 }
 
-void TConfigInitializerYdb::AdaptNodeRegistrationParams(
-    NProto::TStorageServiceConfig& config)
-{
-    if (!ServerConfig || !ServerConfig->GetServerConfig()) {
-        return;
-    }
-
-    const auto* serverConfig = ServerConfig->GetServerConfig();
-
-    if (!config.GetNodeRegistrationMaxAttempts()) {
-        config.SetNodeRegistrationMaxAttempts(
-            serverConfig->GetNodeRegistrationMaxAttempts());
-    }
-
-    if (!config.GetNodeRegistrationTimeout()) {
-        config.SetNodeRegistrationTimeout(
-            serverConfig->GetNodeRegistrationTimeout());
-    }
-
-    if (!config.GetNodeRegistrationErrorTimeout()) {
-        config.SetNodeRegistrationErrorTimeout(
-            serverConfig->GetNodeRegistrationErrorTimeout());
-    }
-
-    if (!config.GetNodeRegistrationToken()) {
-        config.SetNodeRegistrationToken(
-            serverConfig->GetNodeRegistrationToken());
-    }
-
-    if (!config.GetNodeType()) {
-        config.SetNodeType(serverConfig->GetNodeType());
-    }
-}
-
 }   // namespace NCloud::NBlockStore::NServer
diff --git a/cloud/blockstore/libs/daemon/ydb/config_initializer.h b/cloud/blockstore/libs/daemon/ydb/config_initializer.h
@@ -78,7 +78,6 @@ struct TConfigInitializerYdb final
 
 private:
     void SetupStorageConfig(NProto::TStorageServiceConfig& config) const;
-    void AdaptNodeRegistrationParams(NProto::TStorageServiceConfig& config);
 
     void ApplyDiagnosticsConfig(const TString& text);
     void ApplyDiscoveryServiceConfig(const TString& text);

diff --git a/cloud/blockstore/libs/disk_agent/config_initializer.cpp b/cloud/blockstore/libs/disk_agent/config_initializer.cpp
@@ -139,7 +139,12 @@ void TConfigInitializer::InitStorageConfig()
         ParseProtoTextFromFileRobust(Options->StorageConfig, storageConfig);
     }
 
-    AdaptNodeRegistrationParams(storageConfig);
+    if (ServerConfig && ServerConfig->GetServerConfig()) {
+        NStorage::AdaptNodeRegistrationParams(
+            Options->NodeType,
+            *ServerConfig->GetServerConfig(),
+            storageConfig);
+    }
 
     if (Options->SchemeShardDir) {
         storageConfig.SetSchemeShardDir(GetFullSchemeShardDir());
@@ -383,7 +388,12 @@ void TConfigInitializer::ApplyStorageServiceConfig(const TString& text)
     NProto::TStorageServiceConfig storageConfig;
     ParseProtoTextFromStringRobust(text, storageConfig);
 
-    AdaptNodeRegistrationParams(storageConfig);
+    if (ServerConfig && ServerConfig->GetServerConfig()) {
+        NStorage::AdaptNodeRegistrationParams(
+            Options->NodeType,
+            *ServerConfig->GetServerConfig(),
+            storageConfig);
+    }
 
     storageConfig.SetServiceVersionInfo(GetFullVersionString());
     StorageConfig = std::make_shared<NStorage::TStorageConfig>(
@@ -465,42 +475,4 @@ void TConfigInitializer::ApplyCustomCMSConfigs(const NKikimrConfig::TAppConfig&
     }
 }
 
-void TConfigInitializer::AdaptNodeRegistrationParams(
-    NProto::TStorageServiceConfig& config)
-{
-    if (!ServerConfig || !ServerConfig->GetServerConfig()) {
-        return;
-    }
-
-    const auto* serverConfig = ServerConfig->GetServerConfig();
-
-    if (!config.GetNodeRegistrationMaxAttempts()) {
-        config.SetNodeRegistrationMaxAttempts(
-            serverConfig->GetNodeRegistrationMaxAttempts());
-    }
-
-    if (!config.GetNodeRegistrationTimeout()) {
-        config.SetNodeRegistrationTimeout(
-            serverConfig->GetNodeRegistrationTimeout());
-    }
-
-    if (!config.GetNodeRegistrationErrorTimeout()) {
-        config.SetNodeRegistrationErrorTimeout(
-            serverConfig->GetNodeRegistrationErrorTimeout());
-    }
-
-    if (!config.GetNodeRegistrationToken()) {
-        config.SetNodeRegistrationToken(
-            serverConfig->GetNodeRegistrationToken());
-    }
-
-    if (Options->NodeType) {
-        config.SetNodeType(Options->NodeType);
-    }
-
-    if (!config.GetNodeType()) {
-        config.SetNodeType(serverConfig->GetNodeType());
-    }
-}
-
 }   // namespace NCloud::NBlockStore::NServer
diff --git a/cloud/blockstore/libs/disk_agent/config_initializer.h b/cloud/blockstore/libs/disk_agent/config_initializer.h
@@ -61,7 +61,6 @@ struct TConfigInitializer
 
 private:
     TString GetFullSchemeShardDir() const;
-    void AdaptNodeRegistrationParams(NProto::TStorageServiceConfig& config);
 
     void SetupMonitoringConfig(NKikimrConfig::TMonitoringConfig& monConfig) const;
     void SetupLogConfig(NKikimrConfig::TLogConfig& logConfig) const;

diff --git a/cloud/blockstore/libs/storage/core/config.cpp b/cloud/blockstore/libs/storage/core/config.cpp
@@ -958,4 +958,38 @@ const NProto::TStorageServiceConfig& TStorageConfig::GetStorageConfigProto() con
     return Impl->StorageServiceConfig;
 }
 
+void AdaptNodeRegistrationParams(
+    const TString& overriddenNodeType,
+    const NProto::TServerConfig& serverConfig,
+    NProto::TStorageServiceConfig& storageConfig)
+{
+    if (!storageConfig.GetNodeRegistrationMaxAttempts()) {
+        storageConfig.SetNodeRegistrationMaxAttempts(
+            serverConfig.GetNodeRegistrationMaxAttempts());
+    }
+
+    if (!storageConfig.GetNodeRegistrationTimeout()) {
+        storageConfig.SetNodeRegistrationTimeout(
+            serverConfig.GetNodeRegistrationTimeout());
+    }
+
+    if (!storageConfig.GetNodeRegistrationErrorTimeout()) {
+        storageConfig.SetNodeRegistrationErrorTimeout(
+            serverConfig.GetNodeRegistrationErrorTimeout());
+    }
+
+    if (!storageConfig.GetNodeRegistrationToken()) {
+        storageConfig.SetNodeRegistrationToken(
+            serverConfig.GetNodeRegistrationToken());
+    }
+
+    if (overriddenNodeType) {
+        storageConfig.SetNodeType(overriddenNodeType);
+    }
+
+    if (!storageConfig.GetNodeType()) {
+        storageConfig.SetNodeType(serverConfig.GetNodeType());
+    }
+}
+
 }   // namespace NCloud::NBlockStore::NStorage
diff --git a/cloud/blockstore/libs/storage/core/config.h b/cloud/blockstore/libs/storage/core/config.h
@@ -2,7 +2,7 @@
 
 #include "public.h"
 
-
+#include <cloud/blockstore/config/server.pb.h>
 #include <cloud/blockstore/config/storage.pb.h>
 #include <cloud/storage/core/libs/features/features_config.h>
 #include <cloud/storage/core/protos/media.pb.h>
@@ -610,4 +610,9 @@ ui64 GetAllocationUnit(
     const TStorageConfig& config,
     NCloud::NProto::EStorageMediaKind mediaKind);
 
+void AdaptNodeRegistrationParams(
+    const TString& overriddenNodeType,
+    const NProto::TServerConfig& serverConfig,
+    NProto::TStorageServiceConfig& storageConfig);
+
 }   // namespace NCloud::NBlockStore::NStorage