Use node info from labels in configs dispatcher instead of tenant pool (#11238)

Author: Enjection

ydb/core/cms/console/configs_dispatcher.cpp

@@ -301,7 +301,13 @@ void TConfigsDispatcher::Bootstrap()
         CurrentConfig,
         0,
         true,
-        1);
+        1,
+        {},
+        {},
+        TNodeInfo{
+            .Tenant = Labels.contains("tenant") ? Labels.at("tenant") : TString(""),
+            .NodeType = Labels.contains("node_type") ? Labels.at("node_type") : TString(""),
+        });
     CommonSubscriptionClient = RegisterWithSameMailbox(commonClient);
 
     Become(&TThis::StateInit);

ydb/core/cms/console/console_configs_subscriber.cpp

@@ -49,7 +49,8 @@ class TConfigsSubscriber : public TActorBootstrapped<TConfigsSubscriber> {
             bool processYaml,
             ui64 version,
             const TString &yamlConfig,
-            const TMap<ui64, TString> &volatileYamlConfigs)
+            const TMap<ui64, TString> &volatileYamlConfigs,
+            const std::optional<TNodeInfo> explicitNodeInfo)
         : OwnerId(ownerId)
         , Cookie(cookie)
         , Kinds(kinds)
@@ -68,6 +69,15 @@ class TConfigsSubscriber : public TActorBootstrapped<TConfigsSubscriber> {
                 VolatileYamlConfigHashes[id] = THash<TString>()(config);
             }
         }
+
+        if (explicitNodeInfo) {
+            if (explicitNodeInfo->Tenant) {
+                Tenant = explicitNodeInfo->Tenant;
+            } else {
+                Tenant = "<none>";
+            }
+            NodeType = explicitNodeInfo->NodeType;
+        }
     }
 
     static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
@@ -83,7 +93,11 @@ class TConfigsSubscriber : public TActorBootstrapped<TConfigsSubscriber> {
             return;
         }
 
-        SendPoolStatusRequest(ctx);
+        if (!Tenant) {
+            SendPoolStatusRequest(ctx);
+        } else {
+            Subscribe(ctx);
+        }
         Become(&TThis::StateWork);
     }
 
@@ -418,9 +432,19 @@ IActor *CreateConfigsSubscriber(
     bool processYaml,
     ui64 version,
     const TString &yamlConfig,
-    const TMap<ui64, TString> &volatileYamlConfigs)
+    const TMap<ui64, TString> &volatileYamlConfigs,
+    const std::optional<TNodeInfo> explicitNodeInfo)
 {
-    return new TConfigsSubscriber(ownerId, cookie, kinds, currentConfig, processYaml, version, yamlConfig, volatileYamlConfigs);
+    return new TConfigsSubscriber(
+        ownerId,
+        cookie,
+        kinds,
+        currentConfig,
+        processYaml,
+        version,
+        yamlConfig,
+        volatileYamlConfigs,
+        explicitNodeInfo);
 }
 
 } // namespace NKikimr::NConsole

ydb/core/cms/console/console_configs_subscriber.h

@@ -6,8 +6,15 @@
 
 #include <ydb/library/actors/core/actor.h>
 
+#include <optional>
+
 namespace NKikimr::NConsole {
 
+struct TNodeInfo {
+    TString Tenant;
+    TString NodeType;
+};
+
 IActor *CreateConfigsSubscriber(
     const TActorId &ownerId,
     const TVector<ui32> &kinds,
@@ -16,6 +23,7 @@ IActor *CreateConfigsSubscriber(
     bool processYaml = false,
     ui64 version = 0,
     const TString &yamlConfig = {},
-    const TMap<ui64, TString> &volatileYamlConfigs = {});
+    const TMap<ui64, TString> &volatileYamlConfigs = {},
+    const std::optional<TNodeInfo> explicitNodeInfo = std::nullopt);
 
 } // namespace NKikimr::NConsole

ydb/core/cms/console/log_settings_configurator_ut.cpp

@@ -263,7 +263,11 @@ Y_UNIT_TEST_SUITE(TLogSettingsConfiguratorTests)
 
     Y_UNIT_TEST(TestRemoveComponentEntries)
     {
-        TTenantTestRuntime runtime(DefaultConsoleTestConfig());
+        NKikimrConfig::TAppConfig ext;
+        auto& label = *ext.AddLabels();
+        label.SetName("tenant");
+        label.SetValue(TENANT1_1_NAME);
+        TTenantTestRuntime runtime(DefaultConsoleTestConfig(), ext);
         auto settings = InitLogSettingsConfigurator(runtime);
         WaitForUpdate(runtime); // initial update
 
@@ -292,7 +296,11 @@ Y_UNIT_TEST_SUITE(TLogSettingsConfiguratorTests)
 
     Y_UNIT_TEST(TestChangeDefaults)
     {
-        TTenantTestRuntime runtime(DefaultConsoleTestConfig());
+        NKikimrConfig::TAppConfig ext;
+        auto& label = *ext.AddLabels();
+        label.SetName("tenant");
+        label.SetValue(TENANT1_1_NAME);
+        TTenantTestRuntime runtime(DefaultConsoleTestConfig(), ext);
         auto settings = InitLogSettingsConfigurator(runtime);
         WaitForUpdate(runtime); // initial update