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 <cbodley@redhat.com>
(cherry picked from commit e617990efe4c39f592cff1541ea55fbcf9f2d6f2)

Conflicts:
	qa/suites/rgw/verify/tasks/rgw_tests.yaml : Resolved for rgw

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index a8f897873def8b4dc23e98935872f0b586c2ca61..6c7ba3d10bb99b898001911e4f2eb3d705674862 100644 (file)
--- 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 31b00688823853463a780c251883becd4ed0b05d..8b1e39f3d1608ace6b17fd6181004608909fb25d 100644 (file)
--- 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 c7095285c59b3af5ae00fc17942f99a7348d3ae9..7399e12b7e887fbed1db2e3b02525be81c64ec8c 100644 (file)
--- 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