From 960f00071fa1fd5326aae24f9dabc1fe4479c2b7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Jul 2017 11:42:31 -0400 Subject: [PATCH] qa/suites: disable mon crush smoke test with valgrind Valgrind runs itself on forked children, and does its cleanup when they complete, and this is slow... slow enough that it frequently makes the test time out. Valgrind let's you ignore child *processes* that you exec, but I can't find a way to skip forked children in the same address space. Work around this by skip this validation when running under valgrind. Fixes: http://tracker.ceph.com/issues/20602 Signed-off-by: Sage Weil --- qa/suites/fs/verify/validater/valgrind.yaml | 2 ++ qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml | 2 ++ qa/suites/rados/verify/validater/valgrind.yaml | 2 ++ qa/suites/rgw/multisite/valgrind.yaml | 2 ++ qa/suites/rgw/verify/validater/valgrind.yaml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/qa/suites/fs/verify/validater/valgrind.yaml b/qa/suites/fs/verify/validater/valgrind.yaml index ae2eced9aa0..6982cedfcab 100644 --- a/qa/suites/fs/verify/validater/valgrind.yaml +++ b/qa/suites/fs/verify/validater/valgrind.yaml @@ -16,6 +16,8 @@ overrides: conf: global: osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] diff --git a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml index 65af1a2e817..347c499528e 100644 --- a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml +++ b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml @@ -16,6 +16,8 @@ overrides: debug deliberately leak memory: true osd max object name len: 460 osd max object namespace len: 64 + mon: + mon osd crush smoke test: false valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] diff --git a/qa/suites/rados/verify/validater/valgrind.yaml b/qa/suites/rados/verify/validater/valgrind.yaml index 73f1e2e831d..b2095b0c91d 100644 --- a/qa/suites/rados/verify/validater/valgrind.yaml +++ b/qa/suites/rados/verify/validater/valgrind.yaml @@ -10,6 +10,8 @@ overrides: conf: global: osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml index 76fe61e81ea..08fad9da023 100644 --- a/qa/suites/rgw/multisite/valgrind.yaml +++ b/qa/suites/rgw/multisite/valgrind.yaml @@ -9,6 +9,8 @@ overrides: conf: global: osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml index 73f1e2e831d..b2095b0c91d 100644 --- a/qa/suites/rgw/verify/validater/valgrind.yaml +++ b/qa/suites/rgw/verify/validater/valgrind.yaml @@ -10,6 +10,8 @@ overrides: conf: global: osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] -- 2.39.5