]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd: make common options override krbd-specific options 37407/head
authorIlya Dryomov <idryomov@gmail.com>
Fri, 25 Sep 2020 07:55:04 +0000 (09:55 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Fri, 25 Sep 2020 07:55:04 +0000 (09:55 +0200)
commite3288f74b004d148496b97e9bd8bdd6e3c3c3d3b
tree6493a806c8a2aaf82019c680cb296a4e02295bf7
parent7de90821269d16c3e13d4ffecde4b7286d252c77
rbd: make common options override krbd-specific options

ceph-csi has added support for passing custom map and unmap options via
mapOptions and unmapOptions storage class parameters.  However, it also
uses --read-only for implementing ROX (ReadOnlyMany) PVs.  If the user
supplies "mapOptions: rw", they will get around the intended read-only
restriction (at least on the block device).

ceph-csi could be patched to use "-o ro", but it actually makes sense
for common options to win over device type-specific equivalents.

Fixes: https://tracker.ceph.com/issues/47625
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit a107c47360ecdb8c09768ca9eab2341100245711)

Conflicts:
src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
  commit 34f539d8af33 ("rbd: delay parsing of default kernel map
  options") not in nautilus ]
doc/man/8/rbd.rst
qa/rbd/krbd_blkroset.t
src/tools/rbd/action/Kernel.cc