From 00f2fde6ac9829fbb5fd00a6f68c58e9aae89c22 Mon Sep 17 00:00:00 2001 From: Xianqiang Lei Date: Fri, 20 Nov 2026 13:55:19 +0800 Subject: [PATCH] vitastor-disk: pass config_path to vitastor-cli/vitastor-osd --- src/disk_tool/disk_tool.cpp | 1 + src/disk_tool/disk_tool_prepare.cpp | 20 +++++++++++++++++--- src/disk_tool/disk_tool_udev.cpp | 10 ++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/disk_tool/disk_tool.cpp b/src/disk_tool/disk_tool.cpp index 3028e716..e8f16bc5 100644 --- a/src/disk_tool/disk_tool.cpp +++ b/src/disk_tool/disk_tool.cpp @@ -65,6 +65,7 @@ static const char *help_text = " --force Bypass partition safety checks (for emptiness and so on)\n" " \n" " Options (both modes):\n" + " --config_path Path to Vitastor configuration file\n" " --tags tag1,tag2 Set new OSD tag(s)\n" " --weight Set new OSD weight (between 0 and 1)\n" " --journal_size 32M/1G Set journal size (area or partition size)\n" diff --git a/src/disk_tool/disk_tool_prepare.cpp b/src/disk_tool/disk_tool_prepare.cpp index ea20f7a7..342e2e78 100644 --- a/src/disk_tool/disk_tool_prepare.cpp +++ b/src/disk_tool/disk_tool_prepare.cpp @@ -239,10 +239,19 @@ int disk_tool_t::prepare_one(std::map options, int is_ { osd_num_str = options["osd_num"]; } - else if (shell_exec({ "vitastor-cli", "alloc-osd" }, "", &osd_num_str, NULL) != 0) + else { - dsk.close_all(); - return 1; + std::vector cmd = { "vitastor-cli", "alloc-osd" }; + if (options.find("config_path") != options.end()) + { + cmd.push_back("--config_path"); + cmd.push_back(options["config_path"]); + } + if (shell_exec(cmd, "", &osd_num_str, NULL) != 0) + { + dsk.close_all(); + return 1; + } } osd_num_t osd_num = stoull_full(trim(osd_num_str), 10); if (!osd_num) @@ -255,6 +264,11 @@ int disk_tool_t::prepare_one(std::map options, int is_ if (options.find("weight") != options.end() || options.find("tags") != options.end()) { std::vector cmd = { "vitastor-cli", "modify-osd", std::to_string(osd_num) }; + if (options.find("config_path") != options.end()) + { + cmd.push_back("--config_path"); + cmd.push_back(options["config_path"]); + } if (options.find("weight") != options.end()) { cmd.push_back("--reweight"); diff --git a/src/disk_tool/disk_tool_udev.cpp b/src/disk_tool/disk_tool_udev.cpp index c9d3a13c..504efbb9 100644 --- a/src/disk_tool/disk_tool_udev.cpp +++ b/src/disk_tool/disk_tool_udev.cpp @@ -324,6 +324,11 @@ int disk_tool_t::exec_osd(std::string device) argstr.push_back("--"+kv.first); argstr.push_back(kv.second.is_string() ? kv.second.string_value() : kv.second.dump()); } + if (options.find("config_path") != options.end()) + { + argstr.push_back("--config_path"); + argstr.push_back(options["config_path"]); + } char *argv[argstr.size()+1]; for (int i = 0; i < argstr.size(); i++) { @@ -453,6 +458,11 @@ int disk_tool_t::purge_devices(const std::vector & devices) return 0; } std::vector rm_osd_cli = { "vitastor-cli", "rm-osd", "--allow-up" }; + if (options.find("config_path") != options.end()) + { + rm_osd_cli.push_back("--config_path"); + rm_osd_cli.push_back(options["config_path"]); + } for (auto osd_num: osd_numbers) { rm_osd_cli.push_back(std::to_string(osd_num)); -- 2.47.3