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

qa: switch to use the merge fragment for fscrypt #50728

Merged
merged 3 commits into from
Jun 12, 2023
Merged

qa: switch to use the merge fragment for fscrypt #50728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f52f131
qa: remove the FuseMount/KernelMount check in test_fscrypt.py
lxbsz Mar 29, 2023
e7272e7
qa: switch to use .qa/cephfs/mount/ instead
lxbsz Mar 29, 2023
04fab9b
qa: switch to use the merge fragment for fscrypt
lxbsz Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions qa/suites/fs/fscrypt/mount
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.qa/cephfs/mount
1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/mount-syntax/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/mount-syntax/v1.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/mount.yaml
View file
Open in desktop

This file was deleted.

Empty file removed qa/suites/fs/fscrypt/mount/kclient/overrides/%
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/overrides/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/overrides/distro/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/overrides/distro/testing/.qa
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qa/suites/fs/fscrypt/mount/kclient/overrides/distro/testing/k-testing.yaml
View file
Open in desktop

This file was deleted.

0 qa/suites/fs/fscrypt/mount/kclient/% → qa/suites/fs/fscrypt/tasks/%
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions qa/suites/fs/fscrypt/tasks/0-client.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
teuthology:
postmerge:
# Once can we make sure the distro kernels have included the fscrypt feature
# or the ceph-fuse have supported the fscrypt feature we can remove this
# restriction.
Comment on lines +3 to +5
Copy link
Contributor

Choose a reason for hiding this comment

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

we will have to keep track on this right whether and when this feature is added to distro kernels and/or ceph-fuse?

Copy link
Member Author

@lxbsz lxbsz Mar 29, 2023 •
edited

Choose a reason for hiding this comment

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

I added this comment just as Patrick mentioned in the previous PR, just to make it clear why we add this restriction here and in which case we can remove it. But couldn't foresee when.

Copy link
Contributor

Choose a reason for hiding this comment

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

right, i mean once the distro kernels/ceph-fuse are capable of fscrypt then we need to change it here and also here https://github.com/ceph/ceph/pull/48183/files#diff-63be9c532a24d81b6391bb01e3d994eef8eb6a948154c227164063e6acd592f7R3-R7. So it would be better that we note it down somewhere, or better way is to link these two in the fscrypt feature PR

Copy link
Member Author

Choose a reason for hiding this comment

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

I just linked this to the fscrypt feature PR #50728. Thanks.

- if not is_kupstream() then reject() end
task:
0 ...ites/fs/fscrypt/tasks/fscrypt-common.yaml → ...fscrypt/tasks/1-tests/fscrypt-common.yaml
View file
Open in desktop
File renamed without changes.
0 ...ites/fs/fscrypt/tasks/fscrypt-dbench.yaml → ...fscrypt/tasks/1-tests/fscrypt-dbench.yaml
View file
Open in desktop
File renamed without changes.
0 qa/suites/fs/fscrypt/tasks/fscrypt-ffsb.yaml → ...s/fscrypt/tasks/1-tests/fscrypt-ffsb.yaml
View file
Open in desktop
File renamed without changes.
0 ...ites/fs/fscrypt/tasks/fscrypt-iozone.yaml → ...fscrypt/tasks/1-tests/fscrypt-iozone.yaml
View file
Open in desktop
File renamed without changes.
0 qa/suites/fs/fscrypt/tasks/fscrypt-pjd.yaml → ...fs/fscrypt/tasks/1-tests/fscrypt-pjd.yaml
View file
Open in desktop
File renamed without changes.
17 changes: 0 additions & 17 deletions qa/tasks/cephfs/test_fscrypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,7 @@ class TestFscrypt(XFSTestsDev):
def setup_xfsprogs_devs(self):
self.install_xfsprogs = True

def require_kernel_mount(self):
from tasks.cephfs.fuse_mount import FuseMount
from tasks.cephfs.kernel_mount import KernelMount

# TODO: make xfstests-dev compatible with ceph-fuse. xfstests-dev
# remounts CephFS before running tests using kernel, so ceph-fuse
# mounts are never actually tested.
if isinstance(self.mount_a, FuseMount):
self.skipTest('Requires kernel client; xfstests-dev not '\
'compatible with ceph-fuse ATM.')
elif isinstance(self.mount_a, KernelMount):
log.info('client is kernel mounted')

def test_fscrypt_encrypt(self):
self.require_kernel_mount()

# XXX: check_status is set to False so that we can check for command's
# failure on our own (since this command doesn't set right error code
# and error message in some cases) and print custom log messages
Expand All @@ -51,8 +36,6 @@ def test_fscrypt_encrypt(self):
self.assertIn('Passed all 26 tests', stdout)

def test_fscrypt_dummy_encryption_with_quick_group(self):
self.require_kernel_mount()

self.write_local_config('test_dummy_encryption')

# XXX: check_status is set to False so that we can check for command's
Expand Down