use notcmalloc builder for valgrind leak checking

This reverts 453d72b294af6d3db1ae7a212ba9b43209d69f26.  It turns out that
tcmalloc defeats the leak checking in valgrind.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 279f39d4c18004ed7b005b430d3862b8b2ec2f73)

diff --git a/suites/fs/verify/validater/valgrind.yaml b/suites/fs/verify/validater/valgrind.yaml
index 10693216929dbddd0e62687e80db74b62ba98c7d..c3d3aed4892c22c4ee6c102fc284e53565230448 100644 (file)
--- a/suites/fs/verify/validater/valgrind.yaml
+++ b/suites/fs/verify/validater/valgrind.yaml
@@ -1,4 +1,7 @@
 overrides:
+  install:
+    ceph:
+      flavor: notcmalloc
   ceph:
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]

diff --git a/suites/multimds/verify/validater/valgrind.yaml b/suites/multimds/verify/validater/valgrind.yaml
index 10693216929dbddd0e62687e80db74b62ba98c7d..c3d3aed4892c22c4ee6c102fc284e53565230448 100644 (file)
--- a/suites/multimds/verify/validater/valgrind.yaml
+++ b/suites/multimds/verify/validater/valgrind.yaml
@@ -1,4 +1,7 @@
 overrides:
+  install:
+    ceph:
+      flavor: notcmalloc
   ceph:
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]

diff --git a/suites/rados/verify/validater/valgrind.yaml b/suites/rados/verify/validater/valgrind.yaml
index 518d72b0ffe8a33d639c6f7f7a664d4025701bfa..7b8f7a2862965663efbc55a54576582c5186dbe0 100644 (file)
--- a/suites/rados/verify/validater/valgrind.yaml
+++ b/suites/rados/verify/validater/valgrind.yaml
@@ -1,4 +1,7 @@
 overrides:
+  install:
+    ceph:
+      flavor: notcmalloc
   ceph:
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]

diff --git a/suites/rgw/verify/tasks/rgw_s3tests.yaml b/suites/rgw/verify/tasks/rgw_s3tests.yaml
index 6ff4e8c3487b36aa03ff0c81d63a13e5c7b666e9..c23a2cbf4eca879a183c7cec7bad25f919828fd8 100644 (file)
--- a/suites/rgw/verify/tasks/rgw_s3tests.yaml
+++ b/suites/rgw/verify/tasks/rgw_s3tests.yaml
@@ -1,5 +1,6 @@
 tasks:
 - install:
+    flavor: notcmalloc
 - ceph:
 - rgw:
     client.0:

diff --git a/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml b/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml
index bbbb16638b0309752efd03f3beed464dde9526c2..e1c223c3ee6e1fcdc73c568fe908ebaa34b5b9f0 100644 (file)
--- a/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml
+++ b/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml
@@ -1,5 +1,6 @@
 tasks:
 - install:
+    flavor: notcmalloc
 - ceph:
     conf:
       client.0: 

diff --git a/suites/rgw/verify/tasks/rgw_swift.yaml b/suites/rgw/verify/tasks/rgw_swift.yaml
index 47727cacf22151851c08ba88245a28dfa20db3bc..792fb848a9ebce0dbe103d3ab118245ca915ab1f 100644 (file)
--- a/suites/rgw/verify/tasks/rgw_swift.yaml
+++ b/suites/rgw/verify/tasks/rgw_swift.yaml
@@ -1,5 +1,6 @@
 tasks:
 - install:
+    flavor: notcmalloc
 - ceph:
 - rgw:
     client.0:

diff --git a/suites/rgw/verify/validater/valgrind.yaml b/suites/rgw/verify/validater/valgrind.yaml
index 518d72b0ffe8a33d639c6f7f7a664d4025701bfa..7b8f7a2862965663efbc55a54576582c5186dbe0 100644 (file)
--- a/suites/rgw/verify/validater/valgrind.yaml
+++ b/suites/rgw/verify/validater/valgrind.yaml
@@ -1,4 +1,7 @@
 overrides:
+  install:
+    ceph:
+      flavor: notcmalloc
   ceph:
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]