From: Sage Weil <sage@inktank.com>
Date: Wed, 21 May 2014 22:43:41 +0000 (-0700)
Subject: osd_heartbeat_grace from 20 -> 40 when running valgrind
X-Git-Tag: v0.94.10~27^2^2~404^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c427af0701333fc95f2006a794c805e9f490188e;p=ceph.git

osd_heartbeat_grace from 20 -> 40 when running valgrind

This will mask occasional 'wrongly marked me down' errors when valgrind
is running (it makes things generally slow).

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/suites/fs/verify/validater/valgrind.yaml b/suites/fs/verify/validater/valgrind.yaml
index 10693216929d..234324647685 100644
--- a/suites/fs/verify/validater/valgrind.yaml
+++ b/suites/fs/verify/validater/valgrind.yaml
@@ -1,5 +1,8 @@
 overrides:
   ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]
diff --git a/suites/multimds/verify/validater/valgrind.yaml b/suites/multimds/verify/validater/valgrind.yaml
index 10693216929d..234324647685 100644
--- a/suites/multimds/verify/validater/valgrind.yaml
+++ b/suites/multimds/verify/validater/valgrind.yaml
@@ -1,5 +1,8 @@
 overrides:
   ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]
diff --git a/suites/rados/verify/validater/valgrind.yaml b/suites/rados/verify/validater/valgrind.yaml
index 518d72b0ffe8..b7c7ec2879be 100644
--- a/suites/rados/verify/validater/valgrind.yaml
+++ b/suites/rados/verify/validater/valgrind.yaml
@@ -1,5 +1,8 @@
 overrides:
   ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]
diff --git a/suites/rgw/verify/validater/valgrind.yaml b/suites/rgw/verify/validater/valgrind.yaml
index 518d72b0ffe8..b7c7ec2879be 100644
--- a/suites/rgw/verify/validater/valgrind.yaml
+++ b/suites/rgw/verify/validater/valgrind.yaml
@@ -1,5 +1,8 @@
 overrides:
   ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]
diff --git a/suites/smoke/verify/validater/valgrind.yaml b/suites/smoke/verify/validater/valgrind.yaml
index 518d72b0ffe8..b7c7ec2879be 100644
--- a/suites/smoke/verify/validater/valgrind.yaml
+++ b/suites/smoke/verify/validater/valgrind.yaml
@@ -1,5 +1,8 @@
 overrides:
   ceph:
+    conf:
+      global:
+        osd heartbeat grace: 40
     valgrind:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]