From 608fb1f0e079e950541aea434d33851f199fffdb Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 12 Jan 2016 21:06:48 -0500
Subject: [PATCH] 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>
---
 suites/rbd/valgrind/validator/helgrind.yaml     | 2 ++
 suites/rbd/valgrind/validator/memcheck.yaml     | 2 ++
 suites/rbd/valgrind/workloads/fsx.yaml          | 1 -
 suites/rbd/valgrind/workloads/fsx_helgrind.yaml | 5 -----
 tasks/rbd_fsx.py                                | 4 ++++
 5 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 suites/rbd/valgrind/workloads/fsx_helgrind.yaml

diff --git a/suites/rbd/valgrind/validator/helgrind.yaml b/suites/rbd/valgrind/validator/helgrind.yaml
index 327492a18eb3e..bb9501263ff49 100644
--- 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 abb299179931e..94e87168ae34b 100644
--- 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 ebf85dc51e9b9..5c745a2c6ec5f 100644
--- 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
index 08cdc2abc7c42..0000000000000
--- 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 90a208f41cd08..69baf511f468d 100644
--- 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,
-- 
2.47.3