diff options
| author | Casey Bodley <cbodley@redhat.com> | 2017-05-10 22:29:02 +0200 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2017-05-18 19:37:35 +0200 |
| commit | efb3b181fd2e6ed529f6f861c98ee16bd50bd011 (patch) | |
| tree | 7bc4188288ea843e02f44d66f74660fb4742818a /qa/tasks/util | |
| parent | test/rgw: dont assume zone1 and zone2 are on different clusters (diff) | |
| download | ceph-efb3b181fd2e6ed529f6f861c98ee16bd50bd011.tar.xz ceph-efb3b181fd2e6ed529f6f861c98ee16bd50bd011.zip | |
qa/rgw: add log_level argument to rgwadmin()
changes default level from info to debug
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'qa/tasks/util')
| -rw-r--r-- | qa/tasks/util/rgw.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qa/tasks/util/rgw.py b/qa/tasks/util/rgw.py index d6780e82c04..6dd08879c80 100644 --- a/qa/tasks/util/rgw.py +++ b/qa/tasks/util/rgw.py @@ -18,7 +18,7 @@ def multi_region_enabled(ctx): return 'radosgw_agent' in ctx def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, - format='json', decode=True): + format='json', decode=True, log_level=logging.DEBUG): log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd)) testdir = teuthology.get_testdir(ctx) cluster_name, daemon_type, client_id = teuthology.split_role(client) @@ -34,7 +34,7 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, '--cluster', cluster_name, ] pre.extend(cmd) - log.info('rgwadmin: cmd=%s' % pre) + log.log(log_level, 'rgwadmin: cmd=%s' % pre) (remote,) = ctx.cluster.only(client).remotes.iterkeys() proc = remote.run( args=pre, @@ -51,10 +51,10 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, if not r and out != '': try: j = json.loads(out) - log.info(' json result: %s' % j) + log.log(log_level, ' json result: %s' % j) except ValueError: j = out - log.info(' raw result: %s' % j) + log.log(log_level, ' raw result: %s' % j) return (r, j) def get_user_summary(out, user): |