Support double config mode for BSC/distconf (#13607)

Author: alexvru

include/ydb-cpp-sdk/client/bsconfig/storage_config.h

@@ -14,17 +14,24 @@ namespace NYdb::inline V3::NStorageConfig {
 struct TFetchStorageConfigResult : public TStatus {
     TFetchStorageConfigResult(
             TStatus&& status,
-            std::string&& config)
+            std::string&& config,
+            std::string&& storage_config)
         : TStatus(std::move(status))
         , Config_(std::move(config))
+        , StorageConfig_(std::move(storage_config))
     {}
 
     const std::string& GetConfig() const {
         return Config_;
     }
 
+    const std::string& GetStorageConfig() const {
+        return StorageConfig_;
+    }
+
 private:
     std::string Config_;
+    std::string StorageConfig_;
 };
 
 using TAsyncFetchStorageConfigResult = NThreading::TFuture<TFetchStorageConfigResult>;
@@ -39,10 +46,14 @@ class TStorageConfigClient {
     ~TStorageConfigClient();
 
     // Replace config
-    TAsyncStatus ReplaceStorageConfig(const std::string& config);
+    TAsyncStatus ReplaceStorageConfig(const std::optional<TString>& yaml_config,
+        const std::optional<TString>& storage_yaml_config,
+        std::optional<bool> switch_dedicated_storage_section,
+        bool dedicated_config_mode);
 
     // Fetch current cluster storage config
-    TAsyncFetchStorageConfigResult FetchStorageConfig(const TStorageConfigSettings& settings = {});
+    TAsyncFetchStorageConfigResult FetchStorageConfig(bool dedicated_storage_section, bool dedicated_cluster_section,
+        const TStorageConfigSettings& settings = {});
 
     // Bootstrap cluster with automatic configuration
     TAsyncStatus BootstrapCluster(const std::string& selfAssemblyUUID);

src/api/protos/ydb_bsconfig.proto

@@ -15,7 +15,10 @@ import "src/api/protos/ydb_operation.proto";
 
 message ReplaceStorageConfigRequest {
     Ydb.Operations.OperationParams operation_params = 1;
-    string yaml_config = 2;
+    optional string yaml_config = 2; // cluster yaml config
+    optional string storage_yaml_config = 3; // dedicated storage yaml config (when dual-config mode is enabled)
+    optional bool switch_dedicated_storage_section = 4; // if filled, can turn on or off dedicated section of YAML config
+    bool dedicated_config_mode = 5; // if true, then user expects system to work in dual-config mode
 }
 
 message ReplaceStorageConfigResponse {
@@ -27,14 +30,17 @@ message ReplaceStorageConfigResult {
 
 message FetchStorageConfigRequest {
     Ydb.Operations.OperationParams operation_params = 1;
+    bool dedicated_storage_section = 2;
+    bool dedicated_cluster_section = 3;
 }
 
 message FetchStorageConfigResponse {
     Ydb.Operations.Operation operation = 1;
 }
 
 message FetchStorageConfigResult {
-    string yaml_config = 1;
+    optional string yaml_config = 1;
+    optional string storage_yaml_config = 2;
 }
 
 message BootstrapClusterRequest {

src/client/bsconfig/storage_config.cpp

@@ -14,28 +14,51 @@ class TStorageConfigClient::TImpl : public TClientImplCommon<TStorageConfigClien
     {
     }
 
-    TAsyncStatus ReplaceStorageConfig(const std::string& config) {
+    TAsyncStatus ReplaceStorageConfig(const std::optional<TString>& yaml_config,
+            const std::optional<TString>& storage_yaml_config,
+            std::optional<bool> switch_dedicated_storage_section,
+            bool dedicated_config_mode) {
         auto request = MakeRequest<Ydb::BSConfig::ReplaceStorageConfigRequest>();
-        request.set_yaml_config(config);
+
+        if (yaml_config) {
+            request.set_yaml_config(*yaml_config);
+        }
+        if (storage_yaml_config) {
+            request.set_storage_yaml_config(*storage_yaml_config);
+        }
+        if (switch_dedicated_storage_section) {
+            request.set_switch_dedicated_storage_section(*switch_dedicated_storage_section);
+        }
+        request.set_dedicated_config_mode(dedicated_config_mode);
 
         return RunSimple<Ydb::BSConfig::V1::BSConfigService, Ydb::BSConfig::ReplaceStorageConfigRequest, Ydb::BSConfig::ReplaceStorageConfigResponse>(
             std::move(request),
             &Ydb::BSConfig::V1::BSConfigService::Stub::AsyncReplaceStorageConfig);
     }
 
-    TAsyncFetchStorageConfigResult FetchStorageConfig(const TStorageConfigSettings& settings = {}) {
+    TAsyncFetchStorageConfigResult FetchStorageConfig(bool dedicated_storage_section, bool dedicated_cluster_section,
+			const TStorageConfigSettings& settings = {}) {
         auto request = MakeOperationRequest<Ydb::BSConfig::FetchStorageConfigRequest>(settings);
+        if (dedicated_storage_section) {
+            request.set_dedicated_storage_section(true);
+        }
+        if (dedicated_cluster_section) {
+            request.set_dedicated_cluster_section(true);
+        }
         auto promise = NThreading::NewPromise<TFetchStorageConfigResult>();
 
         auto extractor = [promise] (google::protobuf::Any* any, TPlainStatus status) mutable {
-                NYdb::TStringType config;
-                if (Ydb::BSConfig::FetchStorageConfigResult result; any && any->UnpackTo(&result)) {
-                    config = result.yaml_config();
-                }
-
-                TFetchStorageConfigResult val(TStatus(std::move(status)), std::string{std::move(config)});
-                promise.SetValue(std::move(val));
-            };
+            NYdb::TStringType config;
+            NYdb::TStringType storage_config;
+            if (Ydb::BSConfig::FetchStorageConfigResult result; any && any->UnpackTo(&result)) {
+                config = result.yaml_config();
+                storage_config = result.storage_yaml_config();
+            }
+
+            TFetchStorageConfigResult val(TStatus(std::move(status)), std::string{std::move(config)},
+                std::string{std::move(storage_config)});
+            promise.SetValue(std::move(val));
+        };
 
         Connections_->RunDeferred<Ydb::BSConfig::V1::BSConfigService, Ydb::BSConfig::FetchStorageConfigRequest, Ydb::BSConfig::FetchStorageConfigResponse>(
             std::move(request),
@@ -62,12 +85,16 @@ TStorageConfigClient::TStorageConfigClient(const TDriver& driver, const TCommonC
 
 TStorageConfigClient::~TStorageConfigClient() = default;
 
-TAsyncStatus TStorageConfigClient::ReplaceStorageConfig(const std::string& config) {
-    return Impl_->ReplaceStorageConfig(config);
+TAsyncStatus TStorageConfigClient::ReplaceStorageConfig(const std::optional<TString>& yaml_config,
+        const std::optional<TString>& storage_yaml_config, std::optional<bool> switch_dedicated_storage_section,
+        bool dedicated_config_mode) {
+    return Impl_->ReplaceStorageConfig(yaml_config, storage_yaml_config, switch_dedicated_storage_section,
+        dedicated_config_mode);
 }
 
-TAsyncFetchStorageConfigResult TStorageConfigClient::FetchStorageConfig(const TStorageConfigSettings& settings) {
-    return Impl_->FetchStorageConfig(settings);
+TAsyncFetchStorageConfigResult TStorageConfigClient::FetchStorageConfig(bool dedicated_storage_section,
+        bool dedicated_cluster_section, const TStorageConfigSettings& settings) {
+    return Impl_->FetchStorageConfig(dedicated_storage_section, dedicated_cluster_section, settings);
 }
 
 TAsyncStatus TStorageConfigClient::BootstrapCluster(const std::string& selfAssemblyUUID) {