Merge 8d4ab14 into 9659d35

Author: mregrock

ydb/public/lib/ydb_cli/commands/ya.make

@@ -17,6 +17,7 @@ SRCS(
     ydb_debug.cpp
     ydb_dynamic_config.cpp
     ydb_latency.cpp
+    ydb_node_config.cpp
     ydb_ping.cpp
     ydb_profile.cpp
     ydb_root_common.cpp

ydb/public/lib/ydb_cli/commands/ydb_admin.cpp

@@ -1,6 +1,7 @@
 #include "ydb_admin.h"
 
 #include "ydb_dynamic_config.h"
+#include "ydb_node_config.h"
 #include "ydb_storage_config.h"
 #include "ydb_cluster.h"
 
@@ -20,7 +21,10 @@ class TCommandNode : public TClientCommandTree {
 public:
     TCommandNode()
         : TClientCommandTree("node", {}, "Node-wide administration")
-    {}
+    {
+        AddCommand(std::make_unique<NDynamicConfig::TCommandConfig>());
+        AddCommand(std::make_unique<NNodeConfig::TCommandNodeConfig>());
+    }
 };
 
 class TCommandDatabase : public TClientCommandTree {

ydb/public/lib/ydb_cli/commands/ydb_node_config.cpp

@@ -0,0 +1,117 @@
+#include "ydb_node_config.h"
+#include <util/system/fs.h>
+#include <util/folder/dirut.h>
+#include <ydb-cpp-sdk/client/config/config.h>
+
+namespace NYdb::NConsoleClient::NNodeConfig {
+
+constexpr const char* CONFIG_FILE_NAME = "config.yaml";
+constexpr const char* MAIN_CONFIG_FILE_NAME = "main.yaml";
+constexpr const char* STORAGE_CONFIG_FILE_NAME = "storage.yaml";
+
+bool SaveConfig(const TString& config, const TString& configName, const TString& configDirPath) {
+    try {
+        TString tempPath = TStringBuilder() << configDirPath << "/temp_" << configName;
+        TString configPath = TStringBuilder() << configDirPath << "/" << configName;
+
+        {
+            TFileOutput tempFile(tempPath);
+            tempFile << config;
+            tempFile.Flush();
+        }
+
+        if (!NFs::Rename(tempPath, configPath)) {
+            return false;
+        }
+    } catch (const std::exception& e) {
+        return false;
+    }
+    return true;
+}
+
+TCommandNodeConfig::TCommandNodeConfig()
+    : TClientCommandTree("config", {}, "Node-wide configuration")
+    {
+    AddCommand(std::make_unique<TCommandNodeConfigInit>());
+}
+
+TCommandNodeConfigInit::TCommandNodeConfigInit()
+    : TYdbCommand("init", {}, "Initialize node configuration")
+{
+}
+
+void TCommandNodeConfigInit::PropagateFlags(const TCommandFlags& flags) {
+    TYdbCommand::PropagateFlags(flags);
+    Dangerous = false;
+}
+
+void TCommandNodeConfigInit::Config(TConfig& config) {
+    TYdbCommand::Config(config);
+    config.Opts->AddLongOption('f', "from-config", "Path to the initial configuration file.")
+        .RequiredArgument("[config.yaml]").StoreResult(&ConfigYamlPath);
+    config.Opts->AddLongOption('d', "config-dir", "Path to the directory for storing configuration files.")
+        .Required().RequiredArgument("[directory]").StoreResult(&ConfigDirPath);
+    config.Opts->AddLongOption('s', "seed-node", "Endpoint of the seed node from which the configuration will be fetched.")
+        .RequiredArgument("[HOST:PORT]").StoreResult(&SeedNodeEndpoint);
+    config.Opts->MutuallyExclusive("from-config", "seed-node");
+    config.SetFreeArgsNum(0);
+    config.AllowEmptyDatabase = true;
+    config.AllowEmptyAddress = true;
+}
+
+int TCommandNodeConfigInit::Run(TConfig& config) {
+
+    MakePathIfNotExist(ConfigDirPath.c_str());
+    TString configYaml;
+
+    if (SeedNodeEndpoint) {
+        config.Address = SeedNodeEndpoint;
+        auto driver = std::make_unique<NYdb::TDriver>(CreateDriver(config));
+        auto client = NYdb::NConfig::TConfigClient(*driver);
+
+        auto result = client.FetchAllConfigs().GetValueSync();
+        NStatusHelpers::ThrowOnErrorOrPrintIssues(result);
+        TString clusterConfig;
+        TString storageConfig;
+        for (const auto& entry : result.GetConfigs()) {
+            std::visit([&](auto&& arg) {
+                using T = std::decay_t<decltype(arg)>;
+                if constexpr (std::is_same_v<T, NYdb::NConfig::TMainConfigIdentity>) {
+                    clusterConfig = entry.Config;
+                } else if constexpr (std::is_same_v<T, NYdb::NConfig::TStorageConfigIdentity>) {
+                    storageConfig = entry.Config;
+                }
+            }, entry.Identity);
+        }
+        if (!clusterConfig.empty() && !storageConfig.empty()) {
+            if (SaveConfig(clusterConfig, MAIN_CONFIG_FILE_NAME, ConfigDirPath) &&
+                SaveConfig(storageConfig, STORAGE_CONFIG_FILE_NAME, ConfigDirPath)) {
+                Cout << "Initialized cluster and storage configs in " << ConfigDirPath << "/" << MAIN_CONFIG_FILE_NAME << " and " << STORAGE_CONFIG_FILE_NAME << Endl;
+                return EXIT_SUCCESS;
+            } else {
+                Cout << "Failed to initialize cluster config in " << ConfigDirPath << "/" << MAIN_CONFIG_FILE_NAME << Endl;
+                return EXIT_FAILURE;
+            }
+        }
+        else if (!clusterConfig.empty() && storageConfig.empty()) {
+            configYaml = clusterConfig;
+        }
+        else {
+            Cout << "No main config found on the seed node" << Endl;
+            return EXIT_FAILURE;
+        }
+    }
+    else {
+        configYaml = TFileInput(ConfigYamlPath).ReadAll();
+    }
+    if (SaveConfig(configYaml, CONFIG_FILE_NAME, ConfigDirPath)){
+        Cout << "Initialized cluster config in " << ConfigDirPath << "/" << CONFIG_FILE_NAME << Endl;
+    } else {
+        Cout << "Failed to initialize cluster config in " << ConfigDirPath << "/" << CONFIG_FILE_NAME << Endl;
+        return EXIT_FAILURE;
+    }
+    return EXIT_SUCCESS;
+}
+
+
+} // namespace NYdb::NConsoleClient::NNodeConfig

ydb/public/lib/ydb_cli/commands/ydb_node_config.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ydb_command.h"
+
+namespace NYdb::NConsoleClient::NNodeConfig {
+
+class TCommandNodeConfig : public TClientCommandTree {
+public:
+    TCommandNodeConfig();
+};
+
+class TCommandNodeConfigInit : public TYdbCommand {
+public:
+    TCommandNodeConfigInit();
+    void PropagateFlags(const TCommandFlags& flags) override;
+    void Config(TConfig& config) override;
+    int Run(TConfig& config) override;
+private:
+    TString ConfigYamlPath;
+    TString ConfigDirPath;
+    TString SeedNodeEndpoint;
+};
+
+} // namespace NYdb::NConsoleClient::NNodeConfig