From 8392d7f213b5a0630243c4db4ae5931764f02ce8 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 27 Apr 2015 23:43:41 -0400
Subject: [PATCH] tasks: add support for running fsx under valgrind

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 tasks/ceph.py    |  2 +-
 tasks/rbd_fsx.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tasks/ceph.py b/tasks/ceph.py
index ddd95fd5f0574..f1981f39cb340 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -63,7 +63,7 @@ def ceph_log(ctx, config):
         ctx.cluster.run(
             args=[
                 'sudo',
-                'install', '-d', '-m0755', '--',
+                'install', '-d', '-m0777', '--',
                 '/var/log/ceph/valgrind',
                 '/var/log/ceph/profiling-logger',
                 ],
diff --git a/tasks/rbd_fsx.py b/tasks/rbd_fsx.py
index d848a88c566e8..90a208f41cd08 100644
--- a/tasks/rbd_fsx.py
+++ b/tasks/rbd_fsx.py
@@ -52,7 +52,18 @@ def _run_one_client(ctx, config, role):
     args.extend([
         'adjust-ulimits',
         'ceph-coverage',
-        '{tdir}/archive/coverage'.format(tdir=testdir),
+        '{tdir}/archive/coverage'.format(tdir=testdir)
+    ])
+
+    if config.get('valgrind'):
+        args = teuthology.get_valgrind_args(
+            testdir,
+            'fsx_{id}'.format(id=role),
+            args,
+            config.get('valgrind')
+        )
+
+    args.extend([
         'ceph_test_librbd_fsx',
         '-d', # debug output for all operations
         '-W', '-R', # mmap doesn't work with rbd
-- 
2.39.5