update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / qa / suites / fs / verify / validater / valgrind.yaml

diff --git a/ceph/qa/suites/fs/verify/validater/valgrind.yaml b/ceph/qa/suites/fs/verify/validater/valgrind.yaml
index d614d01c5c32fefde699038fc4b4f953f2b610f8..930872fc7aaa96288c4471ea7ffce5279f9bc65f 100644 (file)
--- a/ceph/qa/suites/fs/verify/validater/valgrind.yaml
+++ b/ceph/qa/suites/fs/verify/validater/valgrind.yaml
@@ -1,6 +1,3 @@
-# Only works on os_type: centos
-# See http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-
 overrides:
   install:
     ceph:
@@ -8,22 +5,25 @@ overrides:
   ceph:
     # Valgrind makes everything slow, so ignore slow requests and extend heartbeat grace
     log-ignorelist:
-      - slow requests are blocked
+      - slow request
+      - SLOW_OPS
+      - MON_DOWN
     conf:
       global:
-        osd heartbeat grace: 40
-      mds:
+        osd heartbeat grace: 60
         mds heartbeat grace: 60
+        mds beacon grace: 60
+      mds:
+        mds valgrind exit: true
       mon:
         mon osd crush smoke test: false
       osd:
         osd fast shutdown: false
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-      osd: [--tool=memcheck]
       mds: [--tool=memcheck]
-# see https://tracker.ceph.com/issues/38621
-#      mgr: [--tool=memcheck]
+    watchdog:
+      daemon_restart: normal
   ceph-fuse:
     client.0:
       valgrind: [--tool=memcheck, --leak-check=full, --show-reachable=yes]