Merge pull request #794 from ceph/wip-rbd-valgrind-jewel

suites/rbd: avoid redundant helgrind tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

suites/rbd/valgrind/validator/helgrind.yaml

@@ -1,4 +1,6 @@
 overrides:
+  rbd_fsx:
+    valgrind: ["--tool=helgrind"]
   workunit:
     env:
       VALGRIND: "helgrind"

suites/rbd/valgrind/validator/memcheck.yaml

@@ -1,4 +1,6 @@
 overrides:
+  rbd_fsx:
+    valgrind: ["--tool=memcheck"]
   workunit:
     env:
       VALGRIND: "memcheck"

suites/rbd/valgrind/workloads/fsx.yaml

@@ -2,4 +2,3 @@ tasks:
 - rbd_fsx:
     clients: [client.0]
     size: 134217728
-    valgrind: [--tool=memcheck]

suites/rbd/valgrind/workloads/fsx_helgrind.yaml

@@ -1,5 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    size: 134217728
-    valgrind: [--tool=helgrind]

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,