Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nautilus: rbd: make common options override krbd-specific options #37407

Merged
merged 1 commit into from
Sep 25, 2020
Merged

nautilus: rbd: make common options override krbd-specific options #37407

merged 1 commit into from
Sep 25, 2020

Conversation

idryomov
Copy link
Contributor

@idryomov
rbd: make common options override krbd-specific options
e3288f7 
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 a107c47)

Conflicts:
	src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
	  commit 34f539d ("rbd: delay parsing of default kernel map
	  options") not in nautilus ]
@idryomov idryomov added this to the nautilus milestone Sep 25, 2020
@idryomov
Copy link
Contributor Author

jenkins test make check

dillaman
dillaman approved these changes Sep 25, 2020
View reviewed changes
Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@dillaman dillaman added nautilus-batch-1 nautilus point releases needs-qa labels Sep 25, 2020
@idryomov
Copy link
Contributor Author

https://pulpito.ceph.com/dis-2020-09-25_11:07:31-krbd-wip-krbd-read-only-override-nautilus-testing-basic-smithi/

@idryomov idryomov merged commit 75b46dd into ceph:nautilus Sep 25, 2020
@idryomov idryomov deleted the wip-krbd-read-only-override-nautilus branch September 25, 2020 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillaman dillaman dillaman approved these changes

Assignees
No one assigned
Labels
bug-fix nautilus-batch-1 nautilus point releases needs-qa rbd
Projects
None yet
Milestone
nautilus
Development

Successfully merging this pull request may close these issues.
2 participants
@idryomov @dillaman