From e617990efe4c39f592cff1541ea55fbcf9f2d6f2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 1 Aug 2018 13:01:30 -0400 Subject: [PATCH] qa/rgw: override valgrind --max-threads for radosgw radosgw now uses 512 frontend threads by default, and valgrind won't start with its default --max-threads=500 Fixes: http://tracker.ceph.com/issues/25214 Signed-off-by: Casey Bodley --- qa/suites/rgw/multisite/tasks/test_multi.yaml | 8 ++++---- qa/suites/rgw/tempest/tasks/rgw_tempest.yaml | 2 +- qa/suites/rgw/verify/tasks/0-install.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml index a8f897873def8..6c7ba3d10bb99 100644 --- a/qa/suites/rgw/multisite/tasks/test_multi.yaml +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -7,13 +7,13 @@ tasks: - ceph: {cluster: c2} - rgw: c1.client.0: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 c1.client.1: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] c2.client.0: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] c2.client.1: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] - rgw-multisite: - rgw-multisite-tests: config: diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml index 31b0068882385..8b1e39f3d1608 100644 --- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml +++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml @@ -28,7 +28,7 @@ tasks: description: Swift Service - rgw: client.0: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 frontend_prefix: /swift use-keystone-role: client.0 - tempest: diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml index 9fb898b033460..d623bbb3493f5 100644 --- a/qa/suites/rgw/verify/tasks/0-install.yaml +++ b/qa/suites/rgw/verify/tasks/0-install.yaml @@ -8,7 +8,7 @@ tasks: - openssl_keys: - rgw: client.0: - valgrind: [--tool=memcheck] + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 overrides: ceph: -- 2.39.5