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

Merge pull request #37385 from idryomov/wip-krbd-read-only-override

Browse Source 
rbd: make common options override krbd-specific options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Ilya Dryomov 2020-09-24 18:20:48 +02:00 committed by GitHub
commit fa83dbd76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -762,7 +762,7 @@ Per client instance `rbd device map` options:
Per mapping (block device) `rbd device map` options:
* rw - Map the image read-write (default).
* rw - Map the image read-write (default). Overridden by --read-only.
* ro - Map the image read-only. Equivalent to --read-only.
@ -772,6 +772,7 @@ Per mapping (block device) `rbd device map` options:
discards (since 4.9).
* exclusive - Disable automatic exclusive lock transitions (since 4.12).
Equivalent to --exclusive.
* lock_timeout=x - A timeout on waiting for the acquisition of exclusive lock
(since 4.17, default is 0 seconds, meaning no timeout).

9
qa/rbd/krbd_blkroset.t
View File

@ -343,6 +343,15 @@ rw -> ro with open_count > 0
$ sudo rbd unmap $DEV
"-o rw --read-only" should result in read-only mapping
======================================================
$ DEV=$(sudo rbd map -o rw --read-only img)
$ blockdev --getro $DEV
1
$ sudo rbd unmap $DEV
Teardown
========

30
src/tools/rbd/action/Kernel.cc
View File

@ -499,20 +499,6 @@ int execute_map(const po::variables_map &vm,
}
MapOptions map_options;
if (vm["quiesce"].as<bool>()) {
std::cerr << "rbd: warning: quiesce is not supported" << std::endl;
}
if (vm["read-only"].as<bool>()) {
put_map_option("rw", "ro", &map_options);
}
if (vm["exclusive"].as<bool>()) {
put_map_option("exclusive", "exclusive", &map_options);
}
if (vm.count("quiesce-hook")) {
std::cerr << "rbd: warning: quiesce-hook is not supported" << std::endl;
}
if (vm.count("options")) {
for (auto &options : vm["options"].as<std::vector<std::string>>()) {
r = parse_map_options(options, &map_options);
@ -523,6 +509,22 @@ int execute_map(const po::variables_map &vm,
}
}
// parse options common to all device types after parsing krbd-specific
// options so that common options win (in particular "-o rw --read-only"
// should result in read-only mapping)
if (vm["read-only"].as<bool>()) {
put_map_option("rw", "ro", &map_options);
}
if (vm["exclusive"].as<bool>()) {
put_map_option("exclusive", "exclusive", &map_options);
}
if (vm["quiesce"].as<bool>()) {
std::cerr << "rbd: warning: quiesce is not supported" << std::endl;
}
if (vm.count("quiesce-hook")) {
std::cerr << "rbd: warning: quiesce-hook is not supported" << std::endl;
}
// connect to the cluster to get the default pool and the default map
// options
librados::Rados rados;