Skip to content

Identify node_type in actor system's auto config #14799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2025
Merged

Identify node_type in actor system's auto config #14799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d63c027
Identify node_type in actor system's auto config
kruall Feb 19, 2025
bff358c
fix build
kruall Feb 20, 2025
fe40f79
Merge branch 'main' into as/auto_identify_node_type
kruall Feb 20, 2025
ed69423
fix build
kruall Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ydb/core/driver_lib/run/auto_config_initializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace NKikimr::NAutoConfigInitializer {
return servicePools;
}

void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config) {
void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode) {
config->SetUseAutoConfig(true);
config->ClearExecutor();

Expand Down Expand Up @@ -272,6 +272,10 @@ namespace NKikimr::NAutoConfigInitializer {
executors.push_back(config->AddExecutor());
}

if (!config->HasNodeType()) {
config->SetNodeType(isDynamicNode ? NKikimrConfig::TActorSystemConfig::COMPUTE : NKikimrConfig::TActorSystemConfig::STORAGE);
}

auto &cpuTable = (config->GetNodeType() == NKikimrConfig::TActorSystemConfig::STORAGE ? StorageCpuTable :
config->GetNodeType() == NKikimrConfig::TActorSystemConfig::COMPUTE ? ComputeCpuTable :
HybridCpuTable );
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/run/auto_config_initializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace NKikimr::NAutoConfigInitializer {

TMap<TString, ui32> GetServicePools(const NKikimrConfig::TActorSystemConfig &config, bool useAutoConfig);

void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config);
void ApplyAutoConfig(NKikimrConfig::TActorSystemConfig *config, bool isDynamicNode);

void ApplyAutoConfig(NKikimrConfig::TGRpcConfig *config, const NKikimrConfig::TActorSystemConfig &asConfig);

Expand Down
3 changes: 2 additions & 1 deletion ydb/core/driver_lib/run/kikimr_services_initializers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,8 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
const NKikimr::TAppData* appData) {
bool hasASCfg = Config.HasActorSystemConfig();
if (!hasASCfg || Config.GetActorSystemConfig().GetUseAutoConfig()) {
NAutoConfigInitializer::ApplyAutoConfig(Config.MutableActorSystemConfig());
bool isDynamicNode = appData->DynamicNameserviceConfig->MinDynamicNodeId <= NodeId;
NAutoConfigInitializer::ApplyAutoConfig(Config.MutableActorSystemConfig(), isDynamicNode);
}

Y_ABORT_UNLESS(Config.HasActorSystemConfig());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/testlib/test_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,9 @@ namespace Tests {
}

auto actorSystemConfig = Settings->AppConfig->GetActorSystemConfig();
const bool useAutoConfig = actorSystemConfig.HasUseAutoConfig() && actorSystemConfig.GetUseAutoConfig();
const bool useAutoConfig = actorSystemConfig.GetUseAutoConfig();
if (useAutoConfig) {
NAutoConfigInitializer::ApplyAutoConfig(&actorSystemConfig);
NAutoConfigInitializer::ApplyAutoConfig(&actorSystemConfig, false);
}

TCpuManagerConfig cpuManager;
Expand Down
Loading