pacific: mds: allow all types of mds caps #52583
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rishabh-d-dave
commented
Jul 21, 2023
Comment on lines
-75
to
+76
| root_squash %= (spaces >> lit("root_squash") >> attr(true)); | ||
| match = -( | ||
| (fs_name >> path >> root_squash)[_val = phoenix::construct<MDSCapMatch>(_2, _1, _3)] | | ||
| (uid >> gidlist)[_val = phoenix::construct<MDSCapMatch>(_1, _2)] | | ||
| (path >> uid >> gidlist)[_val = phoenix::construct<MDSCapMatch>(_1, _2, _3)] | | ||
| (fs_name >> path)[_val = phoenix::construct<MDSCapMatch>(_2, _1)] | | ||
| (fs_name >> root_squash)[_val = phoenix::construct<MDSCapMatch>(std::string(), _1, _2)] | | ||
| (path >> root_squash)[_val = phoenix::construct<MDSCapMatch>(_1, std::string(), _2)] | | ||
| (path)[_val = phoenix::construct<MDSCapMatch>(_1)] | | ||
| (root_squash)[_val = phoenix::construct<MDSCapMatch>(std::string(), std::string(), _1)] | | ||
| (fs_name)[_val = phoenix::construct<MDSCapMatch>(std::string(), | ||
| _1)]); | ||
| root_squash %= -(spaces >> lit("root_squash") >> attr(true)); | ||
| match = (fs_name >> path >> root_squash >> uid >> gidlist)[_val = phoenix::construct<MDSCapMatch>(_1, _2, _3, _4, _5)]; |
There was a problem hiding this comment.
@vshankar
So far this set of changes hasn't disturbed any tests on the main branch but I've always been worried about merging these changes. Especially now since backports are supposed to be stable compared to main branch.
I've raised this backport since you said backporting is needed but please double check if backporting is fine.
There was a problem hiding this comment.
@rishabh-d-dave similar comments as in the quincy backport. Please refer that.
There was a problem hiding this comment.
@rishabh-d-dave ping if this change is required for last pacific release...
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
MDS caps can contain 5 components: name of a CephFS, a path inside CephFS, a flag for enabling root squashing mechanism, a UID and list of GIDs. These 5 components result in 31 combinations, so there can be 31 types of MDS caps. Out of these, the current main branch only allows 11 combinations. This restriction is strange and inappropriate. Ideally, all combinations should be allowed. This strange restriction must've been created unintentionally by previous developers while adding FS name and root squash to MDS caps. A TODO for a allowing a subset of these combination was also left in codebase: https://github.com/ceph/ceph/blob/reef/src/mds/MDSAuthCaps.cc#L69 Fixes: https://tracker.ceph.com/issues/59388 Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 0c36929) Conflicts: src/mds/MDSAuthCaps.cc - Unlike main branch, on Pacific branch, MDSAuthCaps calls string by writing std::string instead of just string.
Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 248e9da)
Currently we check if the right caps parse successfully and the wrong caps fail to parse. Increase the test coverage by adding one more tests -- dump the right caps in to a string after the parsing is successfully and then re-parse the caps and check if re-parsed caps dumps to the exact same string. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit bfacee1)
rishabh-d-dave
force-pushed
the
wip-62028-pacific
branch
from
afcd9ad
to
b9dd208
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/62028
backport of #51317
parent tracker: https://tracker.ceph.com/issues/59388
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh