Fix short config of actor system (#21892)

4 files changed, 14 insertions, 7 deletions

diff --git a/ydb/core/driver_lib/run/auto_config_initializer.cpp b/ydb/core/driver_lib/run/auto_config_initializer.cpp
index d7db2e8c42f..8e1b2286eee 100644
--- a/ydb/core/driver_lib/run/auto_config_initializer.cpp
+++ b/ydb/core/driver_lib/run/auto_config_initializer.cpp
@@ -407,4 +407,12 @@ namespace NKikimr::NAutoConfigInitializer {
         }
     }
 
-} // NKikimr::NActorSystemInitializer
\ No newline at end of file
+} // NKikimr::NActorSystemInitializer
+
+namespace NKikimr {
+    bool NeedToUseAutoConfig(const NKikimrConfig::TActorSystemConfig& config) {
+        return config.GetUseAutoConfig()
+            || config.HasNodeType()
+            || config.HasCpuCount();
+    }
+}
diff --git a/ydb/core/driver_lib/run/auto_config_initializer.h b/ydb/core/driver_lib/run/auto_config_initializer.h
index c29af560e64..abb990902a4 100644
--- a/ydb/core/driver_lib/run/auto_config_initializer.h
+++ b/ydb/core/driver_lib/run/auto_config_initializer.h
@@ -85,3 +85,7 @@ namespace NKikimr::NAutoConfigInitializer {
     void ApplyAutoConfig(NKikimrConfig::TGRpcConfig *config, const NKikimrConfig::TActorSystemConfig &asConfig);
 
 } // NKikimr::NActorSystemInitializer
+
+namespace NKikimr {
+    bool NeedToUseAutoConfig(const NKikimrConfig::TActorSystemConfig& config);
+}
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index c6d00aa3ee5..e0fbb66d11f 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -504,11 +504,6 @@ static TInterconnectSettings GetInterconnectSettings(const NKikimrConfig::TInter
     return result;
 }
 
-bool NeedToUseAutoConfig(const NKikimrConfig::TActorSystemConfig& config) {
-    return config.GetUseAutoConfig()
-        || config.HasNodeType()
-        || config.HasCpuCount();
-}
 
 void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* setup,
                                                    const NKikimr::TAppData* appData) {
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 6455d71cf6a..a7c40b0c504 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -1131,7 +1131,7 @@ void TKikimrRunner::InitializeAppData(const TKikimrRunConfig& runConfig)
 {
     const auto& cfg = runConfig.AppConfig;
 
-    bool useAutoConfig = !cfg.HasActorSystemConfig() || (cfg.GetActorSystemConfig().HasUseAutoConfig() && cfg.GetActorSystemConfig().GetUseAutoConfig());
+    bool useAutoConfig = !cfg.HasActorSystemConfig() || NeedToUseAutoConfig(cfg.GetActorSystemConfig());
     bool useSharedThreads = cfg.HasActorSystemConfig() && cfg.GetActorSystemConfig().HasUseSharedThreads() && cfg.GetActorSystemConfig().GetUseSharedThreads();
     NAutoConfigInitializer::TASPools pools = NAutoConfigInitializer::GetASPools(cfg.GetActorSystemConfig(), useAutoConfig);
     TMap<TString, ui32> servicePools = NAutoConfigInitializer::GetServicePools(cfg.GetActorSystemConfig(), useAutoConfig);