]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: allow arbitrary mount options on kclient mounts 38407/head
authorJeff Layton <jlayton@redhat.com>
Wed, 2 Dec 2020 13:17:24 +0000 (08:17 -0500)
committerJeff Layton <jlayton@redhat.com>
Fri, 4 Dec 2020 23:22:28 +0000 (18:22 -0500)
With this, we can pass a list of mount options to the kclient that will
be added onto the default ones. This is necessary to support testing
with fscache enabled (and other features activated by mount options).

Fixes: https://tracker.ceph.com/issues/6373
Signed-off-by: Jeff Layton <jlayton@redhat.com>
qa/tasks/kclient.py

index 214a951e2a37ced036d7bc955931738c3428156e..be75286bd0dc81be6181eb15cd8a64e0af0b7bce 100644 (file)
@@ -48,6 +48,7 @@ def task(ctx, config):
         -kclient:
             client.0:
                 debug: true
+                mntopts: ["nowsync"]
 
     :param ctx: Context
     :param config: Configuration
@@ -110,8 +111,7 @@ def task(ctx, config):
             remote.run(args=["sudo", "bash", "-c", "echo 'module ceph +p' > /sys/kernel/debug/dynamic_debug/control"])
             remote.run(args=["sudo", "bash", "-c", "echo 'module libceph +p' > /sys/kernel/debug/dynamic_debug/control"])
 
-        kernel_mount.mount()
-
+        kernel_mount.mount(mntopts=client_config.get('mntopts', []))
 
     def umount_all():
         log.info('Unmounting kernel clients...')