RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: add --show-cookie/--cookie option for map/attach commands

Browse Source 
Example:
$ rbd device map rbd-pool/image --show-cookie --try-netlink --device-type nbd

$ rbd device attach rbd-pool/image --device /dev/nbd0 \
      --cookie 6f85d970-10b2-456b-8baf-676aa4d782e4 --device-type nbd

older Kernel versions can use --force to skip the cookie validation

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
This commit is contained in:
Prasanna Kumar Kalever 2021-06-18 12:18:35 +05:30
parent 833e71282a
commit 6df06c7a62
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man/8/rbd.rst
View File

@ -255,7 +255,7 @@ Commands
Show the rbd images that are mapped via the rbd kernel module
(default) or other supported device.
:command:`device map` [-t | --device-type *device-type*] [--read-only] [--exclusive] [-o | --options *device-options*] *image-spec* | *snap-spec*
:command:`device map` [-t | --device-type *device-type*] [--show-cookie] [--read-only] [--exclusive] [-o | --options *device-options*] *image-spec* | *snap-spec*
Map the specified image to a block device via the rbd kernel module
(default) or other supported device (*nbd* on Linux or *ggate* on
FreeBSD).
@ -270,7 +270,7 @@ Commands
The --options argument is a comma separated list of device type
specific options (opt1,opt2=val,...).
:command:`device attach` [-t | --device-type *device-type*] --device *device-path* [--read-only] [--exclusive] [--force] [-o | --options *device-options*] *image-spec* | *snap-spec*
:command:`device attach` [-t | --device-type *device-type*] --device *device-path* [--cookie *device-cookie*] [--read-only] [--exclusive] [--force] [-o | --options *device-options*] *image-spec* | *snap-spec*
Attach the specified image to the specified block device (currently only
`nbd` on Linux). This operation is unsafe and should not be normally used.
In particular, specifying the wrong image or the wrong block device may

9
src/test/cli/rbd/help.t
View File

@ -576,8 +576,8 @@
rbd help device attach
usage: rbd device attach [--device-type <device-type>] [--pool <pool>]
[--namespace <namespace>] [--image <image>]
[--snap <snap>] --device <device> [--read-only]
[--force] [--exclusive] [--quiesce]
[--snap <snap>] --device <device> [--cookie <cookie>]
[--read-only] [--force] [--exclusive] [--quiesce]
[--quiesce-hook <quiesce-hook>] [--options <options>]
<image-or-snap-spec>
@ -596,6 +596,7 @@
--image arg image name
--snap arg snapshot name
--device arg specify device path
--cookie arg specify device cookie
--read-only attach read-only
--force force attach
--exclusive disable automatic exclusive lock transitions
@ -637,7 +638,8 @@
rbd help device map
usage: rbd device map [--device-type <device-type>] [--pool <pool>]
[--namespace <namespace>] [--image <image>]
[--snap <snap>] [--read-only] [--exclusive] [--quiesce]
[--snap <snap>] [--show-cookie] [--read-only]
[--exclusive] [--quiesce]
[--quiesce-hook <quiesce-hook>] [--options <options>]
<image-or-snap-spec>
@ -655,6 +657,7 @@
--namespace arg namespace name
--image arg image name
--snap arg snapshot name
--show-cookie show device cookie
--read-only map read-only
--exclusive disable automatic exclusive lock transitions
--quiesce use quiesce hooks

2
src/tools/rbd/action/Device.cc
View File

@ -175,6 +175,7 @@ void get_map_arguments(po::options_description *positional,
at::add_image_or_snap_spec_options(positional, options,
at::ARGUMENT_MODIFIER_NONE);
options->add_options()
("show-cookie", po::bool_switch(), "show device cookie")
("read-only", po::bool_switch(), "map read-only")
("exclusive", po::bool_switch(), "disable automatic exclusive lock transitions")
("quiesce", po::bool_switch(), "use quiesce hooks")
@ -212,6 +213,7 @@ void get_attach_arguments(po::options_description *positional,
at::ARGUMENT_MODIFIER_NONE);
options->add_options()
("device", po::value<std::string>()->required(), "specify device path")
("cookie", po::value<std::string>(), "specify device cookie")
("read-only", po::bool_switch(), "attach read-only")
("force", po::bool_switch(), "force attach")
("exclusive", po::bool_switch(), "disable automatic exclusive lock transitions")

11
src/tools/rbd/action/Nbd.cc
View File

@ -163,10 +163,13 @@ int execute_attach(const po::variables_map &vm,
return -EINVAL;
}
if (!vm["force"].as<bool>()) {
if (vm.count("cookie")) {
args.push_back("--cookie");
args.push_back(vm["cookie"].as<std::string>());
} else if (!vm["force"].as<bool>()) {
std::cerr << "rbd: could not validate attach request\n";
std::cerr << "rbd: mismatching the image and the device may lead to data corruption\n";
std::cerr << "rbd: must specify --force to proceed" << std::endl;
std::cerr << "rbd: must specify --cookie <arg> or --force to proceed" << std::endl;
return -EINVAL;
}
@ -259,6 +262,10 @@ int execute_map(const po::variables_map &vm,
args.push_back("--quiesce");
}
if (vm["show-cookie"].as<bool>()) {
args.push_back("--show-cookie");
}
if (vm["read-only"].as<bool>()) {
args.push_back("--read-only");
}