Skip to content

Commit 4fa7c1c

Browse files
authored
Use autoconfig when used node_type or cpu_count (#15045)
1 parent 340fbf8 commit 4fa7c1c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,17 @@ static TInterconnectSettings GetInterconnectSettings(const NKikimrConfig::TInter
499499
return result;
500500
}
501501

502+
bool NeedToUseAutoConfig(const NKikimrConfig::TActorSystemConfig& config) {
503+
return config.GetUseAutoConfig()
504+
|| config.HasNodeType()
505+
|| config.HasCpuCount();
506+
}
502507

503508
void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* setup,
504509
const NKikimr::TAppData* appData) {
505510
bool hasASCfg = Config.HasActorSystemConfig();
506-
if (!hasASCfg || Config.GetActorSystemConfig().GetUseAutoConfig()) {
511+
bool useAutoConfig = !hasASCfg || NeedToUseAutoConfig(Config.GetActorSystemConfig());
512+
if (useAutoConfig) {
507513
bool isDynamicNode = appData->DynamicNameserviceConfig->MinDynamicNodeId <= NodeId;
508514
NAutoConfigInitializer::ApplyAutoConfig(Config.MutableActorSystemConfig(), isDynamicNode);
509515
}

0 commit comments

Comments
 (0)