suites/multimds: add kclient disable override

The libcephfs tests are negatively affected by other mounts. This commit
adds a kclient disable in addition to the ceph-fuse one.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/cephfs/tasks/libcephfs_interface_tests.yaml b/cephfs/tasks/libcephfs_interface_tests.yaml
index d9a2f9cdc6d36fac42733512de7cbfbb1a56343a..fb3a05f4854847246eb87dc1ab7f788618b4470f 100644 (file)
--- a/cephfs/tasks/libcephfs_interface_tests.yaml
+++ b/cephfs/tasks/libcephfs_interface_tests.yaml
@@ -1,6 +1,8 @@
 overrides:
   ceph-fuse:
     disabled: true
+  kclient:
+    disabled: true
 tasks:
 - workunit:
     clients:

diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml
index f2eb00bf1187bccfae83509662531e420623b0e1..aaffa033811e20572143cf3c803c96950bd75e78 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_java.yaml
+++ b/suites/fs/basic/tasks/libcephfs_java.yaml
@@ -5,6 +5,8 @@ os_version: "14.04"
 overrides:
   ceph-fuse:
     disabled: true
+  kclient:
+    disabled: true
 tasks:
 - workunit:
     clients:

diff --git a/suites/fs/basic/tasks/libcephfs_python.yaml b/suites/fs/basic/tasks/libcephfs_python.yaml
index ffbbff81b4b16257a4904a67fab34c5a25853df0..e5cbb14ba627c2bfe5abf73bbee6a49e393a4725 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_python.yaml
+++ b/suites/fs/basic/tasks/libcephfs_python.yaml
@@ -1,6 +1,8 @@
 overrides:
   ceph-fuse:
     disabled: true
+  kclient:
+    disabled: true
 tasks:
 - workunit:
     clients:

diff --git a/tasks/kclient.py b/tasks/kclient.py
index ca1fb3ba71642f2962b5b06a0b3838e91a9ee212..3b78187179f0ef1dadca8ec549e448daee65f103 100644 (file)
--- a/tasks/kclient.py
+++ b/tasks/kclient.py
@@ -58,7 +58,7 @@ def task(ctx, config):
         client_roles = config
         config = dict([r, dict()] for r in client_roles)
     elif isinstance(config, dict):
-        client_roles = config.keys()
+        client_roles = filter(lambda x: 'client.' in x, config.keys())
     else:
         raise ValueError("Invalid config object: {0} ({1})".format(config, config.__class__))
 
@@ -79,6 +79,13 @@ def task(ctx, config):
 
     mounts = {}
     for id_, remote in clients:
+        client_config = config.get("client.%s" % id_)
+        if client_config is None:
+            client_config = {}
+
+        if config.get("disabled", False) or not client_config.get('mounted', True):
+            continue
+
         kernel_mount = KernelMount(
             mons,
             test_dir,
@@ -91,7 +98,6 @@ def task(ctx, config):
 
         mounts[id_] = kernel_mount
 
-        client_config = config["client.{0}".format(id_)]
         if client_config.get('debug', False):
             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"])