]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
don't eat exceptions for breakfast
authorSage Weil <sage@newdream.net>
Fri, 2 Sep 2011 18:07:10 +0000 (11:07 -0700)
committerSage Weil <sage@newdream.net>
Fri, 2 Sep 2011 18:07:10 +0000 (11:07 -0700)
fixes 0c2bee1514c1b1e65ca5d52459062e5a45da2d7b

teuthology/task/ceph.py

index 0a611d3791fe4f4f5ef50882037281fd4e10b52b..db19007dbb24b14a5491b33fcc98275b460b23b2 100644 (file)
@@ -212,29 +212,29 @@ def valgrind_post(ctx, config):
     try:
         yield
     finally:
-        if not config.get('valgrind'):
-            return
-        lookup_procs = list()
-        val_path = '/tmp/cephtest/archive/log/{val_dir}/*'.format(val_dir=config.get('valgrind').get('logs', "valgrind"))
-        for remote in ctx.cluster.remotes.iterkeys():
-            #look at valgrind logs for each node
-            proc = remote.run(
-                args=[
-                    'grep', "<kind>", run.Raw(val_path), run.Raw('|'),
-                    'grep', '-v', '-q', "PossiblyLost"],
-                wait = False,
-                check_status=False
-                )
-            lookup_procs.append((proc, remote))
-            
-        valgrind_exception = None
-        for (proc, remote) in lookup_procs:
-            result = proc.exitstatus.get()
-            if result is not 1:
-                valgrind_exception = Exception("saw valgrind issues in {node}".format(node=remote.name))
-        
-        if valgrind_exception is not None:
-            raise valgrind_exception
+        if config.get('valgrind'):
+            lookup_procs = list()
+            val_path = '/tmp/cephtest/archive/log/{val_dir}/*'.format(
+                val_dir=config.get('valgrind').get('logs', "valgrind"))
+            for remote in ctx.cluster.remotes.iterkeys():
+                #look at valgrind logs for each node
+                proc = remote.run(
+                    args=[
+                        'grep', "<kind>", run.Raw(val_path), run.Raw('|'),
+                        'grep', '-v', '-q', "PossiblyLost"],
+                    wait = False,
+                    check_status=False
+                    )
+                lookup_procs.append((proc, remote))
+
+            valgrind_exception = None
+            for (proc, remote) in lookup_procs:
+                result = proc.exitstatus.get()
+                if result is not 1:
+                    valgrind_exception = Exception("saw valgrind issues in {node}".format(node=remote.name))
+
+            if valgrind_exception is not None:
+                raise valgrind_exception
                 
 
 @contextlib.contextmanager