suites/rbd: avoid redundant helgrind tests

Allow rbd_fsx to accept an override for which valgrind tool to use.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/suites/rbd/valgrind/validator/helgrind.yaml b/suites/rbd/valgrind/validator/helgrind.yaml
index 327492a18eb3e378fa018fcd01f7785af7bb3b41..bb9501263ff49e82e10b4317cad1881d7b079c6b 100644 (file)
--- a/suites/rbd/valgrind/validator/helgrind.yaml
+++ b/suites/rbd/valgrind/validator/helgrind.yaml
@@ -1,4 +1,6 @@
 overrides:
+  rbd_fsx:
+    valgrind: ["--tool=helgrind"]
   workunit:
     env:
       VALGRIND: "helgrind"

diff --git a/suites/rbd/valgrind/validator/memcheck.yaml b/suites/rbd/valgrind/validator/memcheck.yaml
index abb299179931e0b57be80ac3839d162600e7be82..94e87168ae34be6ceb24422d57db55523fb745fa 100644 (file)
--- a/suites/rbd/valgrind/validator/memcheck.yaml
+++ b/suites/rbd/valgrind/validator/memcheck.yaml
@@ -1,4 +1,6 @@
 overrides:
+  rbd_fsx:
+    valgrind: ["--tool=memcheck"]
   workunit:
     env:
       VALGRIND: "memcheck"

diff --git a/suites/rbd/valgrind/workloads/fsx.yaml b/suites/rbd/valgrind/workloads/fsx.yaml
index ebf85dc51e9b9a95f82be3d49ef3cac19faba01c..5c745a2c6ec5f960db763d0584cbb44440595102 100644 (file)
--- a/suites/rbd/valgrind/workloads/fsx.yaml
+++ b/suites/rbd/valgrind/workloads/fsx.yaml
@@ -2,4 +2,3 @@ tasks:
 - rbd_fsx:
     clients: [client.0]
     size: 134217728
-    valgrind: [--tool=memcheck]

diff --git a/suites/rbd/valgrind/workloads/fsx_helgrind.yaml b/suites/rbd/valgrind/workloads/fsx_helgrind.yaml
deleted file mode 100644 (file)
index 08cdc2a..0000000
--- a/suites/rbd/valgrind/workloads/fsx_helgrind.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    size: 134217728
-    valgrind: [--tool=helgrind]

diff --git a/tasks/rbd_fsx.py b/tasks/rbd_fsx.py
index 90a208f41cd08129cb4d4cca2a538d8eb13fe9d2..69baf511f468dfae73feb50728b64a412c21dc0c 100644 (file)
--- a/tasks/rbd_fsx.py
+++ b/tasks/rbd_fsx.py
@@ -33,6 +33,7 @@ def task(ctx, config):
           seed: <random seed number, or 0 to use the time>
           ops: <number of operations to do>
           size: <maximum image size in bytes>
+          valgrind: [--tool=<valgrind tool>]
     """
     log.info('starting rbd_fsx...')
     with parallel() as p:
@@ -55,6 +56,9 @@ def _run_one_client(ctx, config, role):
         '{tdir}/archive/coverage'.format(tdir=testdir)
     ])
 
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('rbd_fsx', {}))
+
     if config.get('valgrind'):
         args = teuthology.get_valgrind_args(
             testdir,