Skip to content

reef: qa/cephfs: a bug fix and few missing backport for caps_helper.py#58340

Merged
vshankar merged 6 commits intoceph:reeffrom
rishabh-d-dave:fixes-and-missing-backports
Nov 11, 2024
Merged

reef: qa/cephfs: a bug fix and few missing backport for caps_helper.py#58340
vshankar merged 6 commits intoceph:reeffrom
rishabh-d-dave:fixes-and-missing-backports

Conversation

@rishabh-d-dave
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave commented Jun 28, 2024 •
edited
Loading

The first commit on this backport PR fixes https://tracker.ceph.com/issues/65970.

And rest of the commits bring caps_helper.py in reef branch as close as
possbile to caps_helper.py in main branch, so that such bugs can be avoided
in future.

These latter backports also ensure future backports since these commits will
already be present on reef branch hereonwards.

First commit is somewhat related to #54468.

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

@rishabh-d-dave
qa/cephfs: update _conduct_neg_test_for_root_squash_caps
e758f37 
This method was backported in commit
59c9104 with modifications instead of
backporting along all commits that were needed. Now that those commmits
have been backported, this method is broken and required modifications
again.

This is a direct commit to Reef branch since it's a direct fix and not a
backport/cherry-pick.

Fixes: https://tracker.ceph.com/issues/65970
Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
qa/cephfs/caps_helper: fix a bug in methods that generate cap string
f9f0c9d 
The tuple was not meant to be passed as a whole but its individual
members are to be passed as a list of positional arguments.

Introduced-by: 87025d1
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 64e3dd7)
@rishabh-d-dave
qa/cephfs: upgrade gen_mds_cap_str() in caps_helper
c384b9e 
Modify get_mds_cap_str() to accept a tuple with a single member. In this
case, the only member is assumed to be a permission, FS name is assigned
None type and cephfs_mntpt is assigned '/'.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 0934845)
@rishabh-d-dave
qa/cephfs: use kwargs to unpack tuples in caps_helper.py
336b6db 
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 87025d1)
@rishabh-d-dave
qa/cephfs: declare f-string to get values to substitute variable names
2b36da6 
Fixes: https://tracker.ceph.com/issues/64289
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 8f50048)
@rishabh-d-dave rishabh-d-dave requested a review from a team June 28, 2024 11:54
@github-actions github-actions bot added this to the reef milestone Jun 28, 2024
@rishabh-d-dave rishabh-d-dave changed the title qa/cephfs: a bug fix and few missing backport qa/cephfs: a bug fix and few missing backport for caps_helper.py Jun 28, 2024
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jun 28, 2024

jenkins test make check

@rishabh-d-dave
qa/cephfs: handle case where mntpt is '/' in caps_helper.py
f2be87a 
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 7626bd5)
@rishabh-d-dave rishabh-d-dave force-pushed the fixes-and-missing-backports branch from f913e1b to f2be87a Compare August 23, 2024 10:37
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 8, 2024

jenkins test api

@vshankar vshankar changed the title qa/cephfs: a bug fix and few missing backport for caps_helper.py reef: qa/cephfs: a bug fix and few missing backport for caps_helper.py Sep 9, 2024
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Sep 9, 2024

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

vshankar
vshankar approved these changes Nov 11, 2024
View reviewed changes
Copy link
Contributor

@vshankar vshankar left a comment

Choose a reason for hiding this comment

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

https://tracker.ceph.com/projects/cephfs/wiki/Reef#wip-rishabh-testing-20240909104658-reef

@vshankar vshankar merged commit 42422ce into ceph:reef Nov 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vshankar vshankar vshankar approved these changes

Assignees

No one assigned

Labels

cephfs Ceph File System needs-review tests wip-rishabh-testing5

Projects

None yet

Milestone

reef

Development

Successfully merging this pull request may close these issues.

2 participants

@rishabh-d-dave @vshankar