]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/rgw: add kwargs for debug output
authorCasey Bodley <cbodley@redhat.com>
Tue, 10 Oct 2017 19:05:01 +0000 (15:05 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 10 Nov 2017 18:23:03 +0000 (13:23 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
qa/tasks/rgw_multisite.py
src/test/rgw/test_multi.py

index 74c1f3f9dbd8a07c513ee9fd9e526208fb893569..668696b63b47114ee5d063838b12a4d61070be31 100644 (file)
@@ -187,7 +187,8 @@ class Cluster(multisite.Cluster):
         """ radosgw-admin command """
         args = args or []
         args += ['--cluster', self.name]
-        args += ['--debug-rgw', '0']
+        args += ['--debug-rgw', str(kwargs.pop('debug_rgw', 0))]
+        args += ['--debug-ms', str(kwargs.pop('debug_ms', 0))]
         if kwargs.pop('read_only', False):
             args += ['--rgw-cache-enabled', 'false']
         kwargs['decode'] = False
index bbf6d49f3734197a199444be27e2414a5ca8ebca..bd42fe590649734aaf08508b9ad1e729e4251839 100644 (file)
@@ -52,6 +52,8 @@ class Cluster(multisite.Cluster):
         cmd = [test_path + 'test-rgw-call.sh', 'call_rgw_admin', self.cluster_id]
         if args:
             cmd += args
+        cmd += ['--debug-rgw', str(kwargs.pop('debug_rgw', 0))]
+        cmd += ['--debug-ms', str(kwargs.pop('debug_ms', 0))]
         if kwargs.pop('read_only', False):
             cmd += ['--rgw-cache-enabled', 'false']
         return bash(cmd, **kwargs)