Backport YDB #41434

Author: Aleksandr Usenko

contrib/ydb/core/cms/console/console__get_yaml_config.cpp

@@ -40,8 +40,9 @@ class TConfigsManager::TTxGetYamlConfig : public TTransactionBase<TConfigsManage
         Response->Record.MutableResponse()->add_config(Self->MainYamlConfig);
 
         for (const auto& [database, config] : Self->DatabaseYamlConfigs) {
-            Response->Record.MutableResponse()->add_identity()->set_database(database);
-            Response->Record.MutableResponse()->add_identity()->set_version(config.Version);
+            auto& dbIdentity = *Response->Record.MutableResponse()->add_identity();
+            dbIdentity.set_database(database);
+            dbIdentity.set_version(config.Version);
             Response->Record.MutableResponse()->add_config(config.Config);
         }
 

contrib/ydb/core/grpc_services/rpc_config.cpp

@@ -13,6 +13,127 @@
 #include <contrib/ydb/core/base/auth.h>
 #include <contrib/ydb/core/cms/console/console.h>
 #include <contrib/ydb/core/cms/console/configs_dispatcher.h>
+#include <contrib/ydb/library/services/services.pb.h>
+
+namespace {
+
+TString DescribeConfigIdentity(const Ydb::DynamicConfig::ConfigIdentity& id)
+{
+    TStringBuilder descr;
+
+    switch (id.type_case()) {
+        case Ydb::DynamicConfig::ConfigIdentity::TypeCase::kCluster:
+            descr << "cluster=" << id.cluster();
+            break;
+        case Ydb::DynamicConfig::ConfigIdentity::TypeCase::kDatabase:
+            descr << "database=" << id.database();
+            break;
+        case Ydb::DynamicConfig::ConfigIdentity::TypeCase::TYPE_NOT_SET:
+            descr << "<TYPE_NOT_SET>";
+            break;
+        default:
+            descr << "<unknown-type:" << static_cast<int>(id.type_case()) << ">";
+            break;
+    }
+
+    descr << ";version=" << id.version();
+
+    return descr;
+}
+
+bool ConvertGetConfigToFetchConfigResult(
+    const Ydb::DynamicConfig::GetConfigResult &from,
+    Ydb::Config::FetchConfigResult &to,
+    TString& error)
+{
+    const auto identityCount = from.identity_size();
+    const auto configCount = from.config_size();
+
+    error.clear();
+
+    // Reject Ydb::DynamicConfig::GetConfigResult invariant violation
+    if (identityCount < configCount) {
+        TStringBuilder descr;
+        descr << (configCount - identityCount)
+              << " extra 'config' field with no corresponding 'identity' field";
+        error = descr;
+        return false;
+    }
+    if (identityCount > configCount) {
+        TStringBuilder descr;
+        descr << "no 'config' fields for 'identity' fields [";
+        for (int i = configCount; i < identityCount; i++) {
+            if (i > configCount) {
+                descr << ", ";
+            }
+            descr << "'" << DescribeConfigIdentity(from.identity(i)) << "'";
+        }
+        descr << "]";
+        error = descr;
+        return false;
+    }
+
+    // Reject TYPE_NOT_SET upfront so the error path leaves 'to' untouched
+    {
+        TStringBuilder descr;
+        int unsetCount = 0;
+
+        descr << "'identity' fields with no type set at indices [";
+        for (int i = 0; i < identityCount; i++) {
+            if (from.identity(i).type_case()
+                == Ydb::DynamicConfig::ConfigIdentity::TypeCase::TYPE_NOT_SET)
+            {
+                if (unsetCount > 0) {
+                    descr << ", ";
+                }
+                descr << "#" << i << " - " << "'" << DescribeConfigIdentity(from.identity(i)) << "'";
+                ++unsetCount;
+            }
+        }
+        descr << "]";
+
+        if (unsetCount > 0) {
+            error = descr;
+            return false;
+        }
+    }
+
+    for (int i = 0; i < identityCount; i++) {
+        const auto& srcIdentity = from.identity(i);
+        switch (srcIdentity.type_case()) {
+            case Ydb::DynamicConfig::ConfigIdentity::TypeCase::kCluster: {
+                auto dstEntry = to.add_config();
+                auto dstIdentity = dstEntry->mutable_identity();
+                dstIdentity->set_version(srcIdentity.version());
+                dstIdentity->set_cluster(srcIdentity.cluster());
+                dstIdentity->mutable_main();
+                dstEntry->set_config(from.config(i));
+                break;
+            }
+            case Ydb::DynamicConfig::ConfigIdentity::TypeCase::kDatabase: {
+                auto dstEntry = to.add_config();
+                auto dstIdentity = dstEntry->mutable_identity();
+                dstIdentity->set_version(srcIdentity.version());
+                dstIdentity->mutable_database()->set_database(srcIdentity.database());
+                dstEntry->set_config(from.config(i));
+                break;
+            }
+            case Ydb::DynamicConfig::ConfigIdentity::TypeCase::TYPE_NOT_SET:
+                // TYPE_NOT_SET is rejected with error by pre-validation above
+                break;
+            default:
+                // Any other value comes from a newer Console is skipped with a warning
+                // so we don't fail on forward-compatible additions
+                ALOG_NOTICE(NKikimrServices::GRPC_SERVER,
+                    "Convert Ydb::DynamicConfig::ConfigIdentity to Ydb::Config::FetchConfigResult: "
+                    << "skipped unknown config identity '" << DescribeConfigIdentity(srcIdentity) << "'" );
+                break;
+        }
+    }
+    return true;
+}
+
+} // namespace
 
 namespace NKikimr::NGRpcService {
 
@@ -403,6 +524,8 @@ class TFetchStorageConfigRequest : public TBSConfigRequestGrpc<TFetchStorageConf
         self->OnBootstrap();
 
         if (self->Request_->GetDatabaseName()) {
+            // Database YAML config (Ydb::DynamicConfig::ConfigIdentity::TypeCase::kDatabase)
+            // is requested directly from Console (like legacy API)
             SendRequestToConsole();
             return;
         }
@@ -513,7 +636,19 @@ class TFetchStorageConfigRequest : public TBSConfigRequestGrpc<TFetchStorageConf
     }
 
     void Handle(NConsole::TEvConsole::TEvGetAllConfigsResponse::TPtr& ev) {
-        ReplyWithResult(Ydb::StatusIds::SUCCESS, ev->Get()->Record.GetResponse(), ActorContext());
+        Ydb::Config::FetchConfigResult result;
+        TString error;
+
+        bool succeed = ConvertGetConfigToFetchConfigResult(ev->Get()->Record.GetResponse(), result, error);
+        if (succeed) {
+            ReplyWithResult(Ydb::StatusIds::SUCCESS, result, ActorContext());
+        }
+        else {
+            // The malformed payload comes from the Console tablet (server-side),
+            // not from the gRPC client — so this is an internal-error condition.
+            Reply(Ydb::StatusIds::INTERNAL_ERROR, error,
+                NKikimrIssues::TIssuesIds::DEFAULT_ERROR, ActorContext());
+        }
     }
 };
 

contrib/ydb/library/yaml_config/public/yaml_config.h

@@ -251,7 +251,7 @@ TString ReplaceMetadata(const TString& config, const TMainMetadata& metadata);
 TString UpgradeMainConfigVersion(const TString& config);
 
 /**
- * Takes valid MainConfig and increases version exactly by one
+ * Takes valid StorageConfig and increases version exactly by one
  */
 TString UpgradeStorageConfigVersion(const TString& config);
 

contrib/ydb/public/lib/ydb_cli/commands/ydb_dynamic_config.cpp

@@ -155,6 +155,7 @@ int TCommandConfigFetch::Run(TConfig& config) {
     NStatusHelpers::ThrowOnErrorOrPrintIssues(result);
     TString clusterConfig;
     TString storageConfig;
+    TString databaseConfig;
 
     for (const auto& entry : result.GetConfigs()) {
         std::visit([&](auto&& arg) {
@@ -167,6 +168,8 @@ int TCommandConfigFetch::Run(TConfig& config) {
                 if (DedicatedStorageSection || !DedicatedClusterSection) {
                     storageConfig = entry.Config;
                 }
+            } else if constexpr (std::is_same_v<T, NYdb::NConfig::TDatabaseConfigIdentity>) {
+                databaseConfig = entry.Config;
             }
         }, entry.Identity);
     }
@@ -182,7 +185,9 @@ int TCommandConfigFetch::Run(TConfig& config) {
             // and will get attention that something went horribly wrong
             Cerr << "Unable to bump main config version, returning as-is" << Endl;
         }
-        if (!storageConfig.empty() || DedicatedStorageSection) {
+        if (!storageConfig.empty() || !databaseConfig.empty() ||
+            DedicatedStorageSection)
+        {
             Cerr << "cluster config: " << Endl;
         }
         Cout << clusterConfig << Endl;
@@ -198,13 +203,36 @@ int TCommandConfigFetch::Run(TConfig& config) {
             // and will get attention that something went horribly wrong
             Cerr << "Unable to bump storage config version, returning as-is" << Endl;
         }
-        if (!clusterConfig.empty() || DedicatedClusterSection) {
+        if (!clusterConfig.empty() || !databaseConfig.empty() ||
+            DedicatedClusterSection)
+        {
             Cerr << "storage config:" << Endl;
         }
         Cout << storageConfig << Endl;
     }
 
-    if (clusterConfig.empty() && storageConfig.empty()) {
+    if (!databaseConfig.empty()) {
+        // NOTE: there is no native new-API path for per-database YAML config fetch yet —
+        // the request is routed through Console via the legacy API (see
+        // TFetchStorageConfigRequest::Bootstrap() in rpc_config.cpp).
+        // Console's contract for per-database YAML config replace is
+        // wire metadata.version == stored version, so the CLI must return the fetched
+        // body as-is. Bumping metadata.version here would break the next
+        // fetch | edit | replace round-trip — the user would have to manually fix
+        // the version before re-submitting. Once a native new-API path lands,
+        // this branch can mirror the cluster/storage branches and call
+        // UpgradeDatabaseConfigVersion.
+
+        if (!clusterConfig.empty() || !storageConfig.empty() ||
+            DedicatedStorageSection || DedicatedClusterSection)
+        {
+            Cerr << "database config:" << Endl;
+        }
+        Cout << databaseConfig << Endl;
+    }
+
+    if (clusterConfig.empty() && storageConfig.empty() && databaseConfig.empty())
+    {
         Cerr << "No config returned." << Endl;
         return EXIT_FAILURE;
     }