From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 2 Dec 2020 13:17:24 +0000 (-0500)
Subject: qa: allow arbitrary mount options on kclient mounts
X-Git-Tag: v16.1.0~327^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38407%2Fhead;p=ceph.git

qa: allow arbitrary mount options on kclient mounts

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>
---

diff --git a/qa/tasks/kclient.py b/qa/tasks/kclient.py
index 214a951e2a37..be75286bd0dc 100644
--- a/qa/tasks/kclient.py
+++ b/qa/tasks/kclient.py
@@ -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...')