WIP: per-database

ydb/core/cms/console/configs_dispatcher.cpp

@@ -262,6 +262,7 @@ class TConfigsDispatcher : public TActorBootstrapped<TConfigsDispatcher> {
     TString YamlConfig;
     TMap<ui64, TString> VolatileYamlConfigs;
     TMap<ui64, size_t> VolatileYamlConfigHashes;
+    std::optional<TString> DatabaseYamlConfig;
     TString ResolvedYamlConfig;
     TString ResolvedJsonConfig;
     NKikimrConfig::TAppConfig YamlProtoConfig;
@@ -378,6 +379,7 @@ NKikimrConfig::TAppConfig TConfigsDispatcher::ParseYamlProtoConfig()
             VolatileYamlConfigs,
             Labels,
             newYamlProtoConfig,
+            DatabaseYamlConfig,
             &ResolvedYamlConfig,
             &ResolvedJsonConfig);
     } catch (const yexception& ex) {
@@ -767,25 +769,34 @@ class TConfigurationResult
 {
 public:
     // TODO make ref
-    const NKikimrConfig::TAppConfig& GetConfig() const {
+    const NKikimrConfig::TAppConfig& GetConfig() const override {
         return Config;
     }
 
-    bool HasYamlConfig() const {
+    bool HasYamlConfig() const override {
         return !YamlConfig.empty();
     }
 
-    const TString& GetYamlConfig() const {
+    const TString& GetYamlConfig() const override {
         return YamlConfig;
     }
 
-    TMap<ui64, TString> GetVolatileYamlConfigs() const {
+    TMap<ui64, TString> GetVolatileYamlConfigs() const override {
         return VolatileYamlConfigs;
     }
 
+    bool HasDatabaseYamlConfig() const override {
+        return !DatabaseYamlConfig.empty();
+    }
+
+    const TString& GetDatabaseYamlConfig() const override {
+        return DatabaseYamlConfig;
+    }
+
     NKikimrConfig::TAppConfig Config;
     TString YamlConfig;
     TMap<ui64, TString> VolatileYamlConfigs;
+    TString DatabaseYamlConfig;
 };
 
 void TConfigsDispatcher::UpdateCandidateStartupConfig(TEvConsole::TEvConfigSubscriptionNotification::TPtr &ev)
@@ -806,6 +817,9 @@ try {
     dcClient->SavedResult = configs;
     configs->Config = rec.GetRawConsoleConfig();
     configs->YamlConfig = rec.GetYamlConfig();
+    if (rec.HasDatabaseConfig()) {
+        configs->DatabaseYamlConfig = rec.GetDatabaseConfig();
+    }
     // TODO volatile
     RecordedInitialConfiguratorDeps->DynConfigClient = std::move(dcClient);
     auto deps = RecordedInitialConfiguratorDeps->GetDeps();
@@ -870,10 +884,15 @@ void TConfigsDispatcher::Handle(TEvConsole::TEvConfigSubscriptionNotification::T
 
     CurrentConfig = rec.GetConfig();
 
-    const auto& newYamlConfig = rec.GetYamlConfig();
+    auto newYamlConfig = rec.GetYamlConfig();
 
     bool isYamlChanged = newYamlConfig != YamlConfig;
 
+    if (rec.HasDatabaseConfig() && rec.GetDatabaseConfig() != DatabaseYamlConfig.value_or("")) {
+        DatabaseYamlConfig = rec.GetDatabaseConfig();
+        isYamlChanged = true;
+    }
+
     if (rec.VolatileConfigsSize() != VolatileYamlConfigs.size()) {
         isYamlChanged = true;
     }

ydb/core/cms/console/console.cpp

@@ -186,6 +186,15 @@ void TConsole::Handle(TEvConsole::TEvSetConfigRequest::TPtr &ev, const TActorCon
     TxProcessor->ProcessTx(CreateTxSetConfig(ev), ctx);
 }
 
+bool TConsole::HasTenant(const TString& path) const
+{
+    if (!TenantsManager) {
+        return false;
+    }
+
+    return TenantsManager->HasTenant(path);
+}
+
 IActor *CreateConsole(const TActorId &tablet, TTabletStorageInfo *info)
 {
     return new TConsole(tablet, info);

ydb/core/cms/console/console.h

@@ -375,6 +375,35 @@ namespace TEvConsole {
                 }
             }
         }
+
+        TEvConfigSubscriptionNotification(
+            ui64 generation,
+            const NKikimrConfig::TAppConfig &config,
+            const THashSet<ui32> &affectedKinds,
+            const TString &yamlConfig,
+            const TMap<ui64, TString> &volatileYamlConfigs,
+            const NKikimrConfig::TAppConfig &rawConfig,
+            const TMaybe<TString> dbc)
+        {
+            Record.SetGeneration(generation);
+            Record.MutableConfig()->CopyFrom(config);
+            Record.MutableRawConsoleConfig()->CopyFrom(rawConfig);
+            for (ui32 kind : affectedKinds)
+                Record.AddAffectedKinds(kind);
+
+            if (!yamlConfig.empty()) {
+                Record.SetYamlConfig(yamlConfig);
+                for (auto &[id, config] : volatileYamlConfigs) {
+                    auto *volatileConfig = Record.AddVolatileConfigs();
+                    volatileConfig->SetId(id);
+                    volatileConfig->SetConfig(config);
+                }
+            }
+            if (dbc) {
+                Record.SetDatabaseConfig(*dbc);
+            }
+        }
+
     };
 
     /**

ydb/core/cms/console/console__get_yaml_config.cpp

@@ -12,13 +12,22 @@ class TConfigsManager::TTxGetYamlConfig : public TTransactionBase<TConfigsManage
                      TEvConsole::TEvGetAllConfigsRequest::TPtr &ev)
         : TBase(self)
         , Request(std::move(ev))
+        , Database(Request->Get()->Record.HasDatabase() ? TMaybe<TString>{Request->Get()->Record.GetDatabase()} : TMaybe<TString>{})
     {
     }
 
     bool Execute(TTransactionContext &, const TActorContext &) override
     {
         Response = MakeHolder<TEvConsole::TEvGetAllConfigsResponse>();
 
+        if (Database) {
+            if (Self->YamlConfigPerDatabase.contains(*Database)) {
+                Response->Record.MutableResponse()->set_config(Self->YamlConfigPerDatabase[*Database].Config);
+            }
+
+            return true;
+        }
+
         Response->Record.MutableResponse()->mutable_identity()->set_cluster(Self->ClusterName);
         Response->Record.MutableResponse()->mutable_identity()->set_version(Self->YamlVersion);
         Response->Record.MutableResponse()->set_config(Self->YamlConfig);
@@ -44,6 +53,7 @@ class TConfigsManager::TTxGetYamlConfig : public TTransactionBase<TConfigsManage
 private:
     TEvConsole::TEvGetAllConfigsRequest::TPtr Request;
     THolder<TEvConsole::TEvGetAllConfigsResponse> Response;
+    TMaybe<TString> Database;
 };
 
 ITransaction *TConfigsManager::CreateTxGetYamlConfig(TEvConsole::TEvGetAllConfigsRequest::TPtr &ev)