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.

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

squid: mds: check relevant caps for fs include root_squash #57342

Merged
merged 13 commits into from
May 23, 2024

Conversation

batrick
Copy link
Member

@batrick batrick commented May 7, 2024

backport tracker: https://tracker.ceph.com/issues/65853


backport of #57192
parent tracker: https://tracker.ceph.com/issues/65733

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh

@batrick batrick requested review from a team as code owners May 7, 2024 19:59
@batrick batrick added this to the squid milestone May 7, 2024
@batrick batrick added the cephfs Ceph File System label May 7, 2024
@batrick batrick modified the milestones: squid, v19.1.0 May 7, 2024
@batrick
Copy link
Member Author

batrick commented May 8, 2024

jenkins test make check

Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@batrick
Copy link
Member Author

batrick commented May 17, 2024

This PR is under test in https://tracker.ceph.com/issues/66101.

@batrick batrick modified the milestones: v19.1.0, v19.1.1 May 17, 2024
batrick added 11 commits May 21, 2024 12:18
For testing purposes.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d9239f9)
So we can just pass the caller's kwargs to update_attrs.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 597ff3c)
So we can pass mntargs.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit afcbfc0)
Where the client has root_squash for one cap but not for another. The fs
without root_squash should not necessarily reject the client.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit bccc8ce)

Conflicts:
	qa/tasks/cephfs/test_admin.py: missing test
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 247b4fe)
When denying client reconnects because the MDS caps include root_squash and the
client features do not include CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK, ensure those
caps are only for the file system the MDS is joined to.

Fixes: https://tracker.ceph.com/issues/65733
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit f79ae86)
There is a "client_count" metadata on the health warning that apparently was
intended to be used for aggregating warnings but never was. Add a TODO item for
that.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 6517b70)
Rather than evict all clients lacking this feature bit, raise a health error
that pushes the administrator to address it. This avoids the surprise of having
all affected clients suddenly evicted in the cluster.

Fixes: https://tracker.ceph.com/issues/65733
Fixes: 954ed30
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 66ff5c9)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9d0ab23)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b810bc9)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 79ba897)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 536b47c)
…rning and feature bit

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e70f005)
@batrick
Copy link
Member Author

batrick commented May 21, 2024

minor rebase to fix pending release note conflict

@batrick
Copy link
Member Author

batrick commented May 22, 2024

jenkins test make check

@batrick
Copy link
Member Author

batrick commented May 22, 2024

jenkins test api

Copy link
Member Author

@batrick batrick left a comment

Choose a reason for hiding this comment

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

@batrick
Copy link
Member Author

batrick commented May 22, 2024

Tests in this PR ran successfully in /teuthology/pdonnell-2024-05-20_15:44:59-fs-wip-pdonnell-testing-20240517.203521-squid-debug-distro-default-smithi/7715650/teuthology.log

ultimate failure was for other reasons.

@batrick
Copy link
Member Author

batrick commented May 22, 2024

Ready to merge when jenkins tests pass.

@batrick batrick merged commit 081c73b into ceph:squid May 23, 2024
9 of 10 checks passed
@batrick batrick deleted the wip-65853-squid branch May 23, 2024 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants