#include "include/stringify.h"
#include "common/SubProcess.h"
#include <iostream>
+#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
-#include <boost/scope_exit.hpp>
#include <boost/program_options.hpp>
namespace rbd {
namespace po = boost::program_options;
static int call_nbd_cmd(const po::variables_map &vm,
- const std::vector<const char*> &args)
-{
+ const std::vector<std::string> &args,
+ const std::vector<std::string> &ceph_global_init_args) {
char exe_path[PATH_MAX];
ssize_t exe_path_bytes = readlink("/proc/self/exe", exe_path,
sizeof(exe_path) - 1);
SubProcess process(exe_path, SubProcess::KEEP, SubProcess::KEEP, SubProcess::KEEP);
- if (vm.count("conf")) {
- process.add_cmd_arg("--conf");
- process.add_cmd_arg(vm["conf"].as<std::string>().c_str());
- }
- if (vm.count("cluster")) {
- process.add_cmd_arg("--cluster");
- process.add_cmd_arg(vm["cluster"].as<std::string>().c_str());
- }
- if (vm.count("id")) {
- process.add_cmd_arg("--id");
- process.add_cmd_arg(vm["id"].as<std::string>().c_str());
- }
- if (vm.count("name")) {
- process.add_cmd_arg("--name");
- process.add_cmd_arg(vm["name"].as<std::string>().c_str());
- }
- if (vm.count("mon_host")) {
- process.add_cmd_arg("--mon_host");
- process.add_cmd_arg(vm["mon_host"].as<std::string>().c_str());
- }
- if (vm.count("keyfile")) {
- process.add_cmd_arg("--keyfile");
- process.add_cmd_arg(vm["keyfile"].as<std::string>().c_str());
- }
- if (vm.count("keyring")) {
- process.add_cmd_arg("--keyring");
- process.add_cmd_arg(vm["keyring"].as<std::string>().c_str());
+ for (auto &arg : ceph_global_init_args) {
+ process.add_cmd_arg(arg.c_str());
}
- for (std::vector<const char*>::const_iterator p = args.begin();
- p != args.end(); ++p)
- process.add_cmd_arg(*p);
+ for (auto &arg : args) {
+ process.add_cmd_arg(arg.c_str());
+ }
if (process.spawn()) {
std::cerr << "rbd: failed to run rbd-nbd: " << process.err() << std::endl;
return 0;
}
-void get_show_arguments(po::options_description *positional,
- po::options_description *options)
-{ }
-
-int execute_show(const po::variables_map &vm)
-{
- std::vector<const char*> args;
-
- args.push_back("list-mapped");
-
- return call_nbd_cmd(vm, args);
-}
-
-void get_map_arguments(po::options_description *positional,
- po::options_description *options)
-{
- at::add_image_or_snap_spec_options(positional, options,
- at::ARGUMENT_MODIFIER_NONE);
- options->add_options()
- ("read-only", po::bool_switch(), "map read-only")
- ("exclusive", po::bool_switch(), "forbid writes by other clients")
- ("device", po::value<std::string>(), "specify nbd device")
- ("nbds_max", po::value<std::string>(), "override module param nbds_max")
- ("max_part", po::value<std::string>(), "override module param max_part");
-}
-
-int execute_map(const po::variables_map &vm)
-{
+int get_image_or_snap_spec(const po::variables_map &vm, std::string *spec) {
size_t arg_index = 0;
std::string pool_name;
+ std::string nspace_name;
std::string image_name;
std::string snap_name;
int r = utils::get_pool_image_snapshot_names(
- vm, at::ARGUMENT_MODIFIER_NONE, &arg_index, &pool_name, &image_name,
- &snap_name, utils::SNAPSHOT_PRESENCE_PERMITTED,
+ vm, at::ARGUMENT_MODIFIER_NONE, &arg_index, &pool_name, &nspace_name,
+ &image_name, &snap_name, true, utils::SNAPSHOT_PRESENCE_PERMITTED,
utils::SPEC_VALIDATION_NONE);
if (r < 0) {
return r;
}
- std::vector<const char*> args;
+ spec->append(pool_name);
+ spec->append("/");
+ if (!nspace_name.empty()) {
+ spec->append(nspace_name);
+ spec->append("/");
+ }
+ spec->append(image_name);
+ if (!snap_name.empty()) {
+ spec->append("@");
+ spec->append(snap_name);
+ }
+
+ return 0;
+}
+
+int parse_options(const std::vector<std::string> &options,
+ std::vector<std::string> *args) {
+ for (auto &opts : options) {
+ std::vector<std::string> args_;
+ boost::split(args_, opts, boost::is_any_of(","));
+ for (auto &o : args_) {
+ args->push_back("--" + o);
+ }
+ }
+
+ return 0;
+}
+
+int execute_list(const po::variables_map &vm,
+ const std::vector<std::string> &ceph_global_init_args) {
+#if defined(__FreeBSD__)
+ std::cerr << "rbd: nbd device is not supported" << std::endl;
+ return -EOPNOTSUPP;
+#endif
+ std::vector<std::string> args;
+
+ args.push_back("list-mapped");
+
+ if (vm.count("format")) {
+ args.push_back("--format");
+ args.push_back(vm["format"].as<at::Format>().value);
+ }
+ if (vm["pretty-format"].as<bool>()) {
+ args.push_back("--pretty-format");
+ }
+
+ return call_nbd_cmd(vm, args, ceph_global_init_args);
+}
+
+int execute_map(const po::variables_map &vm,
+ const std::vector<std::string> &ceph_global_init_args) {
+#if defined(__FreeBSD__)
+ std::cerr << "rbd: nbd device is not supported" << std::endl;
+ return -EOPNOTSUPP;
+#endif
+ std::vector<std::string> args;
args.push_back("map");
std::string img;
- img.append(pool_name);
- img.append("/");
- img.append(image_name);
- if (!snap_name.empty()) {
- img.append("@");
- img.append(snap_name);
+ int r = get_image_or_snap_spec(vm, &img);
+ if (r < 0) {
+ return r;
}
- args.push_back(img.c_str());
+ args.push_back(img);
- if (vm["read-only"].as<bool>())
+ if (vm["read-only"].as<bool>()) {
args.push_back("--read-only");
+ }
- if (vm["exclusive"].as<bool>())
+ if (vm["exclusive"].as<bool>()) {
args.push_back("--exclusive");
-
- if (vm.count("device")) {
- args.push_back("--device");
- args.push_back(vm["device"].as<std::string>().c_str());
- }
- if (vm.count("nbds_max")) {
- args.push_back("--nbds_max");
- args.push_back(vm["nbds_max"].as<std::string>().c_str());
- }
- if (vm.count("max_part")) {
- args.push_back("--max_part");
- args.push_back(vm["max_part"].as<std::string>().c_str());
}
- return call_nbd_cmd(vm, args);
-}
+ if (vm.count("options")) {
+ r = parse_options(vm["options"].as<std::vector<std::string>>(), &args);
+ if (r < 0) {
+ return r;
+ }
+ }
-void get_unmap_arguments(po::options_description *positional,
- po::options_description *options)
-{
- positional->add_options()
- ("device-spec", "specify nbd device");
+ return call_nbd_cmd(vm, args, ceph_global_init_args);
}
-int execute_unmap(const po::variables_map &vm)
-{
+int execute_unmap(const po::variables_map &vm,
+ const std::vector<std::string> &ceph_global_init_args) {
+#if defined(__FreeBSD__)
+ std::cerr << "rbd: nbd device is not supported" << std::endl;
+ return -EOPNOTSUPP;
+#endif
std::string device_name = utils::get_positional_argument(vm, 0);
if (!boost::starts_with(device_name, "/dev/")) {
device_name.clear();
}
+ std::string image_name;
if (device_name.empty()) {
- std::cerr << "rbd: nbd unmap requires device path" << std::endl;
+ int r = get_image_or_snap_spec(vm, &image_name);
+ if (r < 0) {
+ return r;
+ }
+ }
+
+ if (device_name.empty() && image_name.empty()) {
+ std::cerr << "rbd: unmap requires either image name or device path"
+ << std::endl;
return -EINVAL;
}
- std::vector<const char*> args;
+ std::vector<std::string> args;
args.push_back("unmap");
- args.push_back(device_name.c_str());
+ args.push_back(device_name.empty() ? image_name : device_name);
+
+ if (vm.count("options")) {
+ int r = parse_options(vm["options"].as<std::vector<std::string>>(), &args);
+ if (r < 0) {
+ return r;
+ }
+ }
+
+ return call_nbd_cmd(vm, args, ceph_global_init_args);
+}
+
+void get_list_arguments_deprecated(po::options_description *positional,
+ po::options_description *options) {
+ at::add_format_options(options);
+}
+
+int execute_list_deprecated(const po::variables_map &vm,
+ const std::vector<std::string> &ceph_global_args) {
+ std::cerr << "rbd: 'nbd list' command is deprecated, "
+ << "use 'device list -t nbd' instead" << std::endl;
+ return execute_list(vm, ceph_global_args);
+}
+
+void get_map_arguments_deprecated(po::options_description *positional,
+ po::options_description *options) {
+ at::add_image_or_snap_spec_options(positional, options,
+ at::ARGUMENT_MODIFIER_NONE);
+ options->add_options()
+ ("read-only", po::bool_switch(), "map read-only")
+ ("exclusive", po::bool_switch(), "forbid writes by other clients")
+ ("device", po::value<std::string>(), "specify nbd device")
+ ("nbds_max", po::value<std::string>(), "override module param nbds_max")
+ ("max_part", po::value<std::string>(), "override module param max_part")
+ ("timeout", po::value<std::string>(), "set nbd request timeout (seconds)");
+}
+
+int execute_map_deprecated(const po::variables_map &vm_deprecated,
+ const std::vector<std::string> &ceph_global_args) {
+ std::cerr << "rbd: 'nbd map' command is deprecated, "
+ << "use 'device map -t nbd' instead" << std::endl;
+
+ po::options_description options;
+ options.add_options()
+ ("options,o", po::value<std::vector<std::string>>()
+ ->default_value(std::vector<std::string>(), ""), "");
+
+ po::variables_map vm = vm_deprecated;
+ po::store(po::command_line_parser({}).options(options).run(), vm);
+
+ std::vector<std::string> opts;
+ if (vm_deprecated.count("device")) {
+ opts.push_back("device=" + vm_deprecated["device"].as<std::string>());
+ }
+ if (vm_deprecated.count("nbds_max")) {
+ opts.push_back("nbds_max=" + vm_deprecated["nbds_max"].as<std::string>());
+ }
+ if (vm_deprecated.count("max_part")) {
+ opts.push_back("max_part=" + vm_deprecated["max_part"].as<std::string>());
+ }
+ if (vm_deprecated.count("timeout")) {
+ opts.push_back("timeout=" + vm_deprecated["timeout"].as<std::string>());
+ }
+
+ vm.at("options").value() = boost::any(opts);
+
+ return execute_map(vm, ceph_global_args);
+}
+
+void get_unmap_arguments_deprecated(po::options_description *positional,
+ po::options_description *options) {
+ positional->add_options()
+ ("image-or-snap-or-device-spec",
+ "image, snapshot, or device specification\n"
+ "[<pool-name>/]<image-name>[@<snapshot-name>] or <device-path>");
+ at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE);
+ at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
+ at::add_snap_option(options, at::ARGUMENT_MODIFIER_NONE);
+}
- return call_nbd_cmd(vm, args);
+int execute_unmap_deprecated(const po::variables_map &vm,
+ const std::vector<std::string> &ceph_global_args) {
+ std::cerr << "rbd: 'nbd unmap' command is deprecated, "
+ << "use 'device unmap -t nbd' instead" << std::endl;
+ return execute_unmap(vm, ceph_global_args);
}
-Shell::SwitchArguments switched_arguments({"read-only"});
+Shell::SwitchArguments switched_arguments({"read-only", "exclusive"});
-Shell::Action action_show(
+Shell::Action action_show_deprecated(
{"nbd", "list"}, {"nbd", "ls"}, "List the nbd devices already used.", "",
- &get_show_arguments, &execute_show);
+ &get_list_arguments_deprecated, &execute_list_deprecated, false);
-Shell::Action action_map(
+Shell::Action action_map_deprecated(
{"nbd", "map"}, {}, "Map image to a nbd device.", "",
- &get_map_arguments, &execute_map);
+ &get_map_arguments_deprecated, &execute_map_deprecated, false);
-Shell::Action action_unmap(
+Shell::Action action_unmap_deprecated(
{"nbd", "unmap"}, {}, "Unmap a nbd device.", "",
- &get_unmap_arguments, &execute_unmap);
+ &get_unmap_arguments_deprecated, &execute_unmap_deprecated, false);
} // namespace nbd
} // namespace action
projects / ceph.git / blobdiff