From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 10 Oct 2017 19:05:01 +0000 (-0400)
Subject: qa/rgw: add kwargs for debug output
X-Git-Tag: v13.0.1~210^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa8a0713de6b5b8ea9c9400f3ed467d87940612a;p=ceph.git

qa/rgw: add kwargs for debug output

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/tasks/rgw_multisite.py b/qa/tasks/rgw_multisite.py
index 74c1f3f9dbd8..668696b63b47 100644
--- a/qa/tasks/rgw_multisite.py
+++ b/qa/tasks/rgw_multisite.py
@@ -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
diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index bbf6d49f3734..bd42fe590649 100644
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -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)