diff --git a/ydb/core/log_backend/log_backend.cpp b/ydb/core/log_backend/log_backend.cpp index ad56e773bef8..8ae6d20c98b4 100644 --- a/ydb/core/log_backend/log_backend.cpp +++ b/ydb/core/log_backend/log_backend.cpp @@ -10,18 +10,20 @@ TAutoPtr CreateLogBackendWithUnifiedAgent( { if (runConfig.AppConfig.HasLogConfig()) { const auto& logConfig = runConfig.AppConfig.GetLogConfig(); + const auto& dnConfig = runConfig.AppConfig.GetDynamicNameserviceConfig(); TAutoPtr logBackend = TLogBackendBuildHelper::CreateLogBackendFromLogConfig(logConfig); if (logConfig.HasUAClientConfig()) { const auto& uaClientConfig = logConfig.GetUAClientConfig(); auto uaCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "ua_client"); auto logName = uaClientConfig.GetLogName(); + auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId(); TAutoPtr uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig( uaClientConfig, uaCounters, logName, - runConfig.TenantName == "" ? "static" : "slot", + runConfig.NodeId <= maxStaticNodeId ? "static" : "slot", runConfig.TenantName, - runConfig.ClusterName + logConfig.HasClusterName() ? logConfig.GetClusterName() : "" ); logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend; } @@ -54,18 +56,20 @@ TAutoPtr CreateMeteringLogBackendWithUnifiedAgent( if (meteringConfig.GetUnifiedAgentEnable() && runConfig.AppConfig.HasLogConfig() && runConfig.AppConfig.GetLogConfig().HasUAClientConfig()) { const auto& logConfig = runConfig.AppConfig.GetLogConfig(); + const auto& dnConfig = runConfig.AppConfig.GetDynamicNameserviceConfig(); const auto& uaClientConfig = logConfig.GetUAClientConfig(); auto uaCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "ua_client"); auto logName = meteringConfig.HasLogName() ? meteringConfig.GetLogName() : uaClientConfig.GetLogName(); + auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId(); TAutoPtr uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig( uaClientConfig, uaCounters, logName, - runConfig.TenantName == "" ? "static" : "slot", + runConfig.NodeId <= maxStaticNodeId ? "static" : "slot", runConfig.TenantName, - runConfig.ClusterName + logConfig.HasClusterName() ? logConfig.GetClusterName() : "" ); logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend; } @@ -109,18 +113,20 @@ TAutoPtr CreateAuditLogUnifiedAgentBackend( const auto& auditConfig = runConfig.AppConfig.GetAuditConfig(); if (auditConfig.HasUnifiedAgentBackend() && runConfig.AppConfig.HasLogConfig() && runConfig.AppConfig.GetLogConfig().HasUAClientConfig()) { const auto& logConfig = runConfig.AppConfig.GetLogConfig(); + const auto& dnConfig = runConfig.AppConfig.GetDynamicNameserviceConfig(); const auto& uaClientConfig = logConfig.GetUAClientConfig(); auto uaCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "ua_client"); auto logName = runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().HasLogName() ? runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().GetLogName() : uaClientConfig.GetLogName(); + auto maxStaticNodeId = dnConfig.GetMaxStaticNodeId(); logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig( uaClientConfig, uaCounters, logName, - runConfig.TenantName == "" ? "static" : "slot", + runConfig.NodeId <= maxStaticNodeId ? "static" : "slot", runConfig.TenantName, - runConfig.ClusterName + logConfig.HasClusterName() ? logConfig.GetClusterName() : "" ); }