From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 1 Aug 2018 17:01:30 +0000 (-0400)
Subject: qa/rgw: override valgrind --max-threads for radosgw
X-Git-Tag: v12.2.9~124^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=486c9d3cd13acdf21c40bb34883483b68ed0356a;p=ceph.git

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/tempest/tasks/rgw_tempest.yaml
	qa/suites/rgw/verify/tasks/0-install.yaml
---

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/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
index cf413389bae6..a21011f1b32e 100644
--- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
@@ -7,7 +7,7 @@ tasks:
 - ceph:
 - rgw:
     client.0:
-      valgrind: [--tool=memcheck]
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 - s3tests:
     client.0:
       force-branch: ceph-luminous
diff --git a/qa/suites/rgw/verify/tasks/rgw_swift.yaml b/qa/suites/rgw/verify/tasks/rgw_swift.yaml
index 9b3aa6febdc9..042fb5ded006 100644
--- a/qa/suites/rgw/verify/tasks/rgw_swift.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_swift.yaml
@@ -7,7 +7,7 @@ tasks:
 - ceph:
 - rgw:
     client.0:
-      valgrind: [--tool=memcheck]
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 - swift:
     client.0:
       rgw_server: client.0