From 7ff9f044e7f1b3ad68413153b25f73687c6088cf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Feb 2012 07:04:45 -0800 Subject: [PATCH] ceph: allow valgrind per-type (not just per-name) --- teuthology/task/ceph.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py index 2e492c78aa..3b2cb50550 100644 --- a/teuthology/task/ceph.py +++ b/teuthology/task/ceph.py @@ -771,8 +771,14 @@ def run_daemon(ctx, config, type_): extra_args = None - if config.get('valgrind') and (config.get('valgrind').get(name, None) is not None): - valgrind_args = config.get('valgrind').get(name) + valgrind_args = None + if config.get('valgrind'): + v = config.get('valgrind') + if v.get(type_, None) is not None: + valgrind_args = v.get(type_) + if v.get(name, None) is not None: + valgrind_args = v.get(name) + if valgrind_args is not None: if not isinstance(valgrind_args, list): valgrind_args = [valgrind_args] log.debug('running %s under valgrind with args %s' % (name, valgrind_args)) -- 2.39.5