From fba69e0e2481236dee5c6db333c0ee48614b8115 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 (cherry picked from commit e617990efe4c39f592cff1541ea55fbcf9f2d6f2) Conflicts: qa/suites/rgw/verify/tasks/rgw_tests.yaml : Resolved for rgw --- qa/suites/rgw/multisite/tasks/test_multi.yaml | 8 ++++---- qa/suites/rgw/tempest/tasks/rgw_tempest.yaml | 2 +- qa/suites/rgw/verify/tasks/rgw_tests.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 a8f897873def..6c7ba3d10bb9 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 31b006888238..8b1e39f3d160 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/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml index c7095285c59b..7399e12b7e88 100644 --- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_tests.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 - s3tests: client.0: force-branch: ceph-mimic -- 2.47.3