Fix the inability to replace config on v2 (#29534)

Author: mregrock

ydb/core/blobstorage/nodewarden/distconf_console.cpp

@@ -120,6 +120,7 @@ namespace NKikimr::NStorage {
             case NKikimrBlobStorage::TEvControllerProposeConfigResponse::CommitIsNotNeeded:
                 // it's okay, just wait for another configuration change or something like that
                 ConfigCommittedToConsole = true;
+                ProposedConfigHashVersion.reset();
                 break;
 
             case NKikimrBlobStorage::TEvControllerProposeConfigResponse::ReverseCommit:

ydb/core/blobstorage/nodewarden/distconf_invoke_storage_config.cpp

@@ -1,15 +1,53 @@
 #include "distconf_invoke.h"
 #include "node_warden_impl.h"
 
+#include <ydb/core/config/validation/validators.h>
 #include <ydb/core/mind/bscontroller/bsc.h>
 
+#include <ydb/library/yaml_config/yaml_config.h>
 #include <ydb/library/yaml_config/yaml_config_parser.h>
 #include <ydb/library/yaml_json/yaml_to_json.h>
 
 namespace NKikimr::NStorage {
 
     using TInvokeRequestHandlerActor = TDistributedConfigKeeper::TInvokeRequestHandlerActor;
 
+    namespace {
+        static std::optional<TString> LocalYamlValidate(const TString& yaml, bool allowUnknown = true) {
+            try {
+                auto doc = NFyaml::TDocument::Parse(yaml);
+                auto resolved = NYamlConfig::ResolveAll(doc);
+
+                TSimpleSharedPtr<NYamlConfig::TBasicUnknownFieldsCollector> unknownCollector =
+                    new NYamlConfig::TBasicUnknownFieldsCollector;
+
+                std::vector<TString> errors;
+                for (auto& [_, config] : resolved.Configs) {
+                    auto appCfg = NYamlConfig::YamlToProto(
+                        config.second,
+                        true,   // strict
+                        true,   // merge database config (if any)
+                        unknownCollector);
+                    if (NKikimr::NConfig::ValidateConfig(appCfg, errors) == NKikimr::NConfig::EValidationResult::Error) {
+                        if (!errors.empty()) {
+                            return errors.front();
+                        } else {
+                            return TString("unknown validation error");
+                        }
+                    }
+                }
+
+                if (!allowUnknown && !unknownCollector->GetUnknownKeys().empty()) {
+                    return TString("has forbidden unknown fields");
+                }
+
+                return std::nullopt;
+            } catch (const std::exception& ex) {
+                return TString(ex.what());
+            }
+        }
+    }
+
     void TInvokeRequestHandlerActor::FetchStorageConfig(bool manual, bool fetchMain, bool fetchStorage) {
         if (!Self->StorageConfig) {
             FinishWithError(TResult::ERROR, "no agreed StorageConfig");
@@ -484,7 +522,15 @@ namespace NKikimr::NStorage {
                     Y_ABORT_UNLESS(prevState == ERootState::IN_PROGRESS);
                     return error;
                 },
-                [&](NKikimrBlobStorage::TStorageConfig& proposedConfig) {
+                [&](NKikimrBlobStorage::TStorageConfig& proposedConfig) -> std::optional<TString> {
+                    // config validation, which is basically done in Console
+                    TString mainYaml;
+                    if (auto err = DecomposeConfig(proposedConfig.GetConfigComposite(), &mainYaml, /*mainConfigVersion=*/ nullptr, /*mainConfigFetchYaml=*/ nullptr)) {
+                        return TString(TStringBuilder() << "Failed to decompose composite config: " << *err);
+                    }
+                    if (auto err = LocalYamlValidate(mainYaml, /*allowUnknown=*/ true)) {
+                        return TString(TStringBuilder() << "YAML validation failed: " << *err);
+                    }
                     StartProposition(&proposedConfig, false);
                     return std::nullopt;
                 }

ydb/core/blobstorage/nodewarden/ya.make

@@ -46,6 +46,7 @@ PEERDIR(
     ydb/core/blobstorage/crypto
     ydb/core/blobstorage/groupinfo
     ydb/core/blobstorage/pdisk
+    ydb/core/config/validation
     ydb/core/control
     ydb/library/pdisk_io
     ydb/library/yaml_config

ydb/core/cms/console/console__replace_yaml_config.cpp

@@ -118,7 +118,9 @@ class TConfigsManager::TTxReplaceMainYamlConfig
 
         TUpdateConfigOpContext opCtx;
         Self->ReplaceMainConfigMetadata(Config, false, opCtx);
-        Self->ValidateMainConfig(opCtx);
+        if (!Force) {
+            Self->ValidateMainConfig(opCtx);
+        }
 
         bool hasForbiddenUnknown = !opCtx.UnknownFields.empty() && !AllowUnknownFields;
         if (opCtx.Error) {
@@ -264,7 +266,9 @@ class TConfigsManager::TTxReplaceDatabaseYamlConfig
 
         TUpdateDatabaseConfigOpContext opCtx;
         Self->ReplaceDatabaseConfigMetadata(Config, false, opCtx);
-        Self->ValidateDatabaseConfig(opCtx);
+        if (!Force) {
+            Self->ValidateDatabaseConfig(opCtx);
+        }
 
         bool hasForbiddenUnknown = !opCtx.UnknownFields.empty() && !AllowUnknownFields;
         if (opCtx.Error) {